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

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

revision 155 by harbaum, Tue Nov 3 08:38:23 2009 UTC revision 205 by harbaum, Mon Nov 23 20:12:22 2009 UTC
# Line 24  Line 24 
24    
25  /*  /*
26   * TODO:   * TODO:
  * - draw caches only once  
  * - prefer duplicates from selected files  
27   * - make semi-transparent caches selectable   * - make semi-transparent caches selectable
28   */   */
29    
# Line 55  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 76  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 154  static gboolean map_gps_update(gpointer Line 153  static gboolean map_gps_update(gpointer
153  }  }
154    
155  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
156    GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
                              cache->type);  
157    
158      GdkPixbuf *icon = icon_get(type, cache->type);
159      GdkPixbuf *over = NULL;
160    
161      if(cache->mine)                   over = icon_get(type, 14);
162      else if(cache->found)             over = icon_get(type, 12);
163      else if(cache->notes) {
164        if(cache->notes->found)         over = icon_get(type, 12);
165        else if(cache->notes->override) over = icon_get(type, 11);
166        else                            over = icon_get(type, 13);
167      }
168    
169      pos_t *pos = &cache->pos;
170    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
171    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
172      GdkPixbuf *over = icon_get(ICON_MISC, 1);      pos = &cache->notes->pos;
173    
174      if(!isnan(pos->lat) && !isnan(pos->lon)) {
175      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
176            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
177        if(over)
178      osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
179            cache->notes->pos.lat, cache->notes->pos.lon, over);                              pos->lat, pos->lon, over);
   } else {  
     if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))  
       osm_gps_map_add_image(OSM_GPS_MAP(map),  
                             cache->pos.lat, cache->pos.lon, icon);  
180    }    }
181  }  }
182    
# Line 224  static void map_setup(map_context_t *con Line 231  static void map_setup(map_context_t *con
231      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
232        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
233    
234          /* clear any pending balloon */
235          context->balloon = NULL;
236          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
237    
238  #ifdef OSD_NAV  #ifdef OSD_NAV
239        /* no navigation in this mode */        /* no navigation in this mode */
240        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
# Line 255  static void map_setup(map_context_t *con Line 266  static void map_setup(map_context_t *con
266      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
267        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
268    
269          /* clear any pending balloon */
270          context->balloon = NULL;
271          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
272    
273  #ifdef OSD_NAV  #ifdef OSD_NAV
274        /* no navigation in this mode */        /* no navigation in this mode */
275        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
276  #endif  #endif
277    
278        /* clear all existing ccahe images */        /* clear all existing cache images */
279        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
280        memset(context->caches_displayed, 0,        memset(context->caches_displayed, 0,
281               (cache_num+1) * sizeof(cache_display_t));               (cache_num+1) * sizeof(cache_display_t));
# Line 286  static void map_setup(map_context_t *con Line 301  static void map_setup(map_context_t *con
301    
302      printf("map_setup(CACHE)\n");      printf("map_setup(CACHE)\n");
303    
304      /* no balloons in this mode */      /* clear any pending balloon */
305      context->balloon = NULL;      context->balloon = NULL;
306      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
307    
# Line 492  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 507  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
507  }  }
508    
509  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
510  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
511  #else  #else
512  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
513  #endif  #endif
514    
515    #ifndef BIG_BALLOONS
516    #define FONT_SIZE 14.0
517    #else
518    #define FONT_SIZE 22.0
519    #endif
520    #define LINE_SKIP  (FONT_SIZE/4)
521    
522    
523  static void  static void
524  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
525    printf("balloon event: ");    printf("balloon event: ");
# Line 522  balloon_cb(osm_gps_map_balloon_event_t * Line 545  balloon_cb(osm_gps_map_balloon_event_t *
545      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;
546    
547      /* draw the cache type icon ... */      /* draw the cache type icon ... */
548      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
549      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
550    
551      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
552        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
553        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
554      }      }
555    
# Line 562  balloon_cb(osm_gps_map_balloon_event_t * Line 585  balloon_cb(osm_gps_map_balloon_event_t *
585      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
586    
587      /* everything from here uses the same font */      /* everything from here uses the same font */
588      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
589                                CAIRO_FONT_SLANT_NORMAL,
590                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
591  #ifndef BIG_BALLOONS  
592      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  
593    
594      if(cache->name) {      if(cache->name) {
595        /* draw cache name */        /* draw cache name */
596        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
597        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
598        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
599        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
600        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
601    
602        /* return to the left border and below text */        /* return to the left border and below text */
603        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
604        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
605      }      }
606    
607      if(cache->terrain) {      if(cache->terrain) {
608          int text_y = 0, icon_y = 0;
609    
610        /* draw cache rating */        /* draw cache rating */
611        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
612        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
613        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
614        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
615          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
616            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
617          else
618            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
619    
620        /* draw "Terrain:" string */        /* draw "Terrain:" string */
621        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
622        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
623        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
624        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
625        x += extents.width + 2;        x += extents.width + 2;
626    
627        /* draw terrain stars */        /* draw terrain stars */
628        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);  
629    
630        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;  
631      }      }
632    
633      if(cache->difficulty) {      if(cache->difficulty) {
634          int text_y = 0, icon_y = 0;
635    
636        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
637          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
638        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;  
639    
640          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
641            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
642          else
643            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
644    
645        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
646        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
647        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
648        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
649        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
650        x += extents.width + 2;        x += extents.width + 2;
651    
652        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);  
653      }      }
654    
655        /* draw container info */
656        /* TODO ... */
657    
658    
659    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
660      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
661             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 685  on_map_button_release_event(GtkWidget *w Line 719  on_map_button_release_event(GtkWidget *w
719    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
720    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
721    /* pretty useless there */    /* pretty useless there */
722    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
723    
724      coord_t coo;      coord_t coo;
725      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 777  on_window_realize(GtkWidget *widget, gpo Line 811  on_window_realize(GtkWidget *widget, gpo
811    
812  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
813                           gpointer data) {                           gpointer data) {
814      map_context_t *context = (map_context_t*)data;
815    
816    printf("map got focus\n");    printf("map got focus\n");
817    map_setup((map_context_t*)data);  
818    #ifdef USE_MAEMO
819      /* re-enable refresh of map */
820      if(!context->handler_id)
821        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
822    #endif
823    
824      map_setup(context);
825    return FALSE;    return FALSE;
826  }  }
827    
828    #ifdef USE_MAEMO
829    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
830                             gpointer data) {
831      map_context_t *context = (map_context_t*)data;
832    
833      printf("map lost focus\n");
834      gtk_timeout_remove(context->handler_id);
835      context->handler_id = 0;
836    
837      return FALSE;
838    }
839    #endif
840    
841  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
842    printf("map_update\n");    printf("map_update\n");
843  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 875  void map(appdata_t *appdata) { Line 931  void map(appdata_t *appdata) {
931    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
932                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
933    
934    #ifdef USE_MAEMO
935      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
936                       G_CALLBACK(on_focus_out), context);
937    #endif
938    
939    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
940                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
941    
Legend:
Removed from v.155  
changed lines
  Added in v.205