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 190 by harbaum, Tue Nov 17 10:22:41 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 492  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 LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
501    #define LINE_SKIP  7
502  #endif  #endif
503    
504  static void  static void
# Line 522  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 562  balloon_cb(osm_gps_map_balloon_event_t * Line 566  balloon_cb(osm_gps_map_balloon_event_t *
566      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
567    
568      /* everything from here uses the same font */      /* everything from here uses the same font */
569      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
570                                CAIRO_FONT_SLANT_NORMAL,
571                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
572    
573  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
574      cairo_set_font_size (event->data.draw.cr, 14.0);  #define FONT_SIZE 14.0
575  #else  #else
576      cairo_set_font_size (event->data.draw.cr, 22.0);  #define FONT_SIZE 22.0
577  #endif  #endif
578    
579        cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
580    
581      if(cache->name) {      if(cache->name) {
582        /* draw cache name */        /* draw cache name */
# Line 585  balloon_cb(osm_gps_map_balloon_event_t * Line 593  balloon_cb(osm_gps_map_balloon_event_t *
593      }      }
594    
595      if(cache->terrain) {      if(cache->terrain) {
596          int text_y = 0, icon_y = 0;
597    
598        /* draw cache rating */        /* draw cache rating */
599        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
600        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
601        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
602        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
603          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
604            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
605          else
606            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
607    
608        /* draw "Terrain:" string */        /* draw "Terrain:" string */
609        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
610        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
611        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
612        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
613        x += extents.width + 2;        x += extents.width + 2;
614    
615        /* draw terrain stars */        /* draw terrain stars */
616        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);  
617    
618        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
619      }      }
620    
621      if(cache->difficulty) {      if(cache->difficulty) {
622          int text_y = 0, icon_y = 0;
623    
624        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
625          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
626        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;  
627    
628          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
629            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
630          else
631            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
632    
633        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
634        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
635        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
636        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
637        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
638        x += extents.width + 2;        x += extents.width + 2;
639    
640        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);  
641      }      }
642    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
643      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
# Line 777  on_window_realize(GtkWidget *widget, gpo Line 794  on_window_realize(GtkWidget *widget, gpo
794    
795  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
796                           gpointer data) {                           gpointer data) {
797      map_context_t *context = (map_context_t*)data;
798    
799    printf("map got focus\n");    printf("map got focus\n");
800    map_setup((map_context_t*)data);  
801    #ifdef USE_MAEMO
802      /* re-enable refresh of map */
803      if(!context->handler_id)
804        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
805    #endif
806    
807      map_setup(context);
808    return FALSE;    return FALSE;
809  }  }
810    
811    #ifdef USE_MAEMO
812    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
813                             gpointer data) {
814      map_context_t *context = (map_context_t*)data;
815    
816      printf("map lost focus\n");
817      gtk_timeout_remove(context->handler_id);
818      context->handler_id = 0;
819    
820      return FALSE;
821    }
822    #endif
823    
824  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
825    printf("map_update\n");    printf("map_update\n");
826  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 875  void map(appdata_t *appdata) { Line 914  void map(appdata_t *appdata) {
914    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
915                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
916    
917    #ifdef USE_MAEMO
918      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
919                       G_CALLBACK(on_focus_out), context);
920    #endif
921    
922    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
923                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
924    
Legend:
Removed from v.155  
changed lines
  Added in v.190