Diff of /trunk/src/osm-gps-map.c

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

revision 68 by harbaum, Thu Aug 20 09:54:10 2009 UTC revision 111 by harbaum, Mon Sep 14 12:16:08 2009 UTC
# Line 49  Line 49 
49    
50  #define EXTRA_BORDER (TILESIZE / 2)  #define EXTRA_BORDER (TILESIZE / 2)
51    
52    #define OSM_GPS_MAP_SCROLL_STEP 10
53    
54    /* any defined key enables key support */
55    #if (defined(OSM_GPS_MAP_KEY_FULLSCREEN) || \
56         defined(OSM_GPS_MAP_KEY_ZOOMIN) || \
57         defined(OSM_GPS_MAP_KEY_ZOOMOUT) || \
58         defined(OSM_GPS_MAP_KEY_UP) || \
59         defined(OSM_GPS_MAP_KEY_DOWN) || \
60         defined(OSM_GPS_MAP_KEY_LEFT) || \
61         defined(OSM_GPS_MAP_KEY_RIGHT))
62    #define OSM_GPS_MAP_KEYS
63    #endif
64    
65    #ifdef OSM_GPS_MAP_KEYS
66    #include <gdk/gdkkeysyms.h>
67    #endif
68    
69    #define USER_AGENT "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11"
70    
71  struct _OsmGpsMapPrivate  struct _OsmGpsMapPrivate
72  {  {
73      GHashTable *tile_queue;      GHashTable *tile_queue;
# Line 78  struct _OsmGpsMapPrivate Line 97  struct _OsmGpsMapPrivate
97      char *proxy_uri;      char *proxy_uri;
98    
99      //where downloaded tiles are cached      //where downloaded tiles are cached
100        char *tile_dir;
101      char *cache_dir;      char *cache_dir;
     gboolean cache_dir_is_full_path;  
102    
103      //contains flags indicating the various special characters      //contains flags indicating the various special characters
104      //the uri string contains, that will be replaced when calculating      //the uri string contains, that will be replaced when calculating
# Line 96  struct _OsmGpsMapPrivate Line 115  struct _OsmGpsMapPrivate
115      gboolean show_trip_history;      gboolean show_trip_history;
116      GSList *trip_history;      GSList *trip_history;
117      coord_t *gps;      coord_t *gps;
118        float gps_heading;
119      gboolean gps_valid;      gboolean gps_valid;
120    
121  #ifdef ENABLE_BALLOON  #ifdef ENABLE_BALLOON
# Line 110  struct _OsmGpsMapPrivate Line 130  struct _OsmGpsMapPrivate
130  #endif  #endif
131    
132  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
133      //the osd controls      //the osd controls (if present)
134      struct {      osm_gps_map_osd_t *osd;
135          GdkPixmap *backup;  #ifdef OSD_DOUBLE_BUFFER
136          cairo_surface_t *overlay;      GdkPixmap *dbuf_pixmap;
137          gint backup_x, backup_y;  #endif
         OsmGpsMapOsdGpsCallback cb;  
         gpointer data;  
     } osd;  
138  #endif  #endif
139    
140    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
141        gboolean fullscreen;
142    #endif
143    
144      //additional images or tracks added to the map      //additional images or tracks added to the map
145      GSList *tracks;      GSList *tracks;
146      GSList *images;      GSList *images;
# Line 171  enum Line 192  enum
192      PROP_REPO_URI,      PROP_REPO_URI,
193      PROP_PROXY_URI,      PROP_PROXY_URI,
194      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
195      PROP_ZOOM,      PROP_ZOOM,
196      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
197      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 332  static void Line 352  static void
352  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
353  {  {
354      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
355        priv->uri_format = 0;
356        priv->the_google = FALSE;
357    
358      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
359          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 568  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 590  osm_gps_map_draw_gps_point (OsmGpsMap *m
590          int x, y;          int x, y;
591          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
592          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
593          // int lw = priv->ui_gps_track_width;          int mr = MAX(3*r,r2);
         int mr = MAX(r,r2);  
594    
595          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
596          map_y0 = priv->map_y - EXTRA_BORDER;          map_y0 = priv->map_y - EXTRA_BORDER;
# Line 600  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 621  osm_gps_map_draw_gps_point (OsmGpsMap *m
621    
622          // draw ball gradient          // draw ball gradient
623          if (r > 0) {          if (r > 0) {
624                // draw direction arrow
625                if(!isnan(priv->gps_heading))
626                {
627                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
628                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
629                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
630                    cairo_close_path (cr);
631    
632                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
633                    cairo_fill_preserve (cr);
634    
635                    cairo_set_line_width (cr, 1.0);
636                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
637                    cairo_stroke(cr);
638                }
639    
640              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);
641              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);
642              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);
# Line 613  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 650  osm_gps_map_draw_gps_point (OsmGpsMap *m
650              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
651              cairo_stroke(cr);              cairo_stroke(cr);
652          }          }
653    
654          cairo_destroy(cr);          cairo_destroy(cr);
655          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
656                                      x-mr,                                      x-mr,
# Line 1078  osm_gps_map_download_tile (OsmGpsMap *ma Line 1115  osm_gps_map_download_tile (OsmGpsMap *ma
1115                  }                  }
1116              }              }
1117    
1118    #ifdef LIBSOUP22
1119                soup_message_headers_append(msg->request_headers,
1120                                            "User-Agent", USER_AGENT);
1121    #endif
1122    
1123              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
1124              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);
1125          } else {          } else {
# Line 1423  osm_gps_map_purge_cache (OsmGpsMap *map) Line 1465  osm_gps_map_purge_cache (OsmGpsMap *map)
1465     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);
1466  }  }
1467    
 #ifdef ENABLE_OSD  
 /* position and extent of bounding box */  
 #define OSD_X      (10)  
 #define OSD_Y      (10)  
   
 #define OSD_COLOR            0.5, 0.5, 1  
 #define OSD_COLOR_DISABLED   0.8, 0.8, 0.8  
   
 /* parameters of the direction shape */  
 #ifndef OSM_GPS_MAP_OSD_DIAMETER  
 #define D_RAD  (30)         // diameter of dpad  
 #else  
 #define D_RAD  (OSM_GPS_MAP_OSD_DIAMETER)  
 #endif  
 #define D_TIP  (4*D_RAD/5)  // distance of arrow tip from dpad center  
 #define D_LEN  (D_RAD/4)    // length of arrow  
 #define D_WID  (D_LEN)      // width of arrow  
   
 /* parameters of the "zoom" pad */  
 #define Z_STEP   (D_RAD/4)  // distance between dpad and zoom  
 #define Z_RAD    (D_RAD/2)  // radius of "caps" of zoom bar  
   
 /* shadow also depends on control size */  
 #define OSD_SHADOW (D_RAD/6)  
   
 /* total width and height of controls incl. shadow */  
 #define OSD_W    (2*D_RAD + OSD_SHADOW)  
 #define OSD_H    (2*D_RAD + Z_STEP + 2*Z_RAD + OSD_SHADOW)  
   
 #define OSD_LBL_SHADOW (OSD_SHADOW/2)  
   
 #define Z_TOP    (2 * D_RAD + Z_STEP)  
 #define Z_MID    (Z_TOP + Z_RAD)  
 #define Z_BOT    (Z_MID + Z_RAD)  
 #define Z_LEFT   (Z_RAD)  
 #define Z_RIGHT  (2 * D_RAD - Z_RAD)  
   
 /* create the cairo shape used for the zoom buttons */  
 static void  
 osm_gps_map_osd_zoom_shape(cairo_t *cr, gint x, gint y) {  
     cairo_move_to (cr, x+Z_LEFT,    y+Z_TOP);  
     cairo_line_to (cr, x+Z_RIGHT,   y+Z_TOP);  
     cairo_arc     (cr, x+Z_RIGHT,   y+Z_MID, Z_RAD, -M_PI/2,  M_PI/2);  
     cairo_line_to (cr, x+Z_LEFT,    y+Z_BOT);  
     cairo_arc     (cr, x+Z_LEFT,    y+Z_MID, Z_RAD,  M_PI/2, -M_PI/2);  
 }  
   
 /* create the cairo shape used for the dpad */  
 static void  
 osm_gps_map_osd_dpad_shape(cairo_t *cr, gint x, gint y) {  
     cairo_arc (cr, x+D_RAD, y+D_RAD, D_RAD, 0, 2 * M_PI);  
 }  
   
 typedef enum {  
     OSD_NONE = 0,  
     OSD_BG,  
     OSD_UP,  
     OSD_DOWN,  
     OSD_LEFT,  
     OSD_RIGHT,  
     OSD_IN,  
     OSD_OUT,  
     OSD_GPS  
 } osd_button_t;  
   
1468  static gboolean  static gboolean
1469  osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)  osm_gps_map_map_redraw (OsmGpsMap *map)
 {  
     return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);  
 }  
   
 /* check whether x/y is within the dpad */  
 static osd_button_t  
 osm_gps_map_osd_check_dpad(gint x, gint y)  
 {  
     /* within entire dpad circle */  
     if( osm_gps_map_in_circle(x, y, OSD_X + D_RAD, OSD_Y + D_RAD, D_RAD))  
     {  
         /* convert into position relative to dpads centre */  
         x -= (OSD_X + D_RAD);  
         y -= (OSD_Y + D_RAD);  
   
         /* check for dpad center goes here! */  
         if( osm_gps_map_in_circle(x, y, 0, 0, D_RAD/3))  
             return OSD_GPS;  
   
         if( y < 0 && abs(x) < abs(y))  
             return OSD_UP;  
   
         if( y > 0 && abs(x) < abs(y))  
             return OSD_DOWN;  
   
         if( x < 0 && abs(y) < abs(x))  
             return OSD_LEFT;  
   
         if( x > 0 && abs(y) < abs(x))  
             return OSD_RIGHT;  
   
         return OSD_BG;  
     }  
     return OSD_NONE;  
 }  
   
 /* check whether x/y is within the zoom pads */  
 static osd_button_t  
 osm_gps_map_osd_check_zoom(gint x, gint y) {  
     if( x > OSD_X && x < (OSD_X + OSD_W) && y > Z_TOP && y < (OSD_Y+Z_BOT)) {  
   
         /* within circle around (-) label */  
         if( osm_gps_map_in_circle(x, y, OSD_X + Z_LEFT, OSD_Y + Z_MID, Z_RAD))  
             return OSD_OUT;  
   
         /* between center of (-) button and center of entire zoom control area */  
         if(x > OSD_LEFT && x < OSD_X + D_RAD)  
             return OSD_OUT;  
   
         /* within circle around (+) label */  
         if( osm_gps_map_in_circle(x, y, OSD_X + Z_RIGHT, OSD_Y + Z_MID, Z_RAD))  
             return OSD_IN;  
   
         /* between center of (+) button and center of entire zoom control area */  
         if(x < OSD_RIGHT && x > OSD_X + D_RAD)  
             return OSD_IN;  
     }  
   
     return OSD_NONE;  
 }  
   
 static osd_button_t  
 osm_gps_map_osd_check(gint x, gint y) {  
     osd_button_t but = OSD_NONE;  
   
     /* first do a rough test for the OSD area. */  
     /* this is just to avoid an unnecessary detailed test */  
     if(x > OSD_X && x < OSD_X + OSD_W &&  
        y > OSD_Y && y < OSD_Y + OSD_H) {  
         but = osm_gps_map_osd_check_dpad(x, y);  
   
         if(but == OSD_NONE)  
             but = osm_gps_map_osd_check_zoom(x, y);  
     }  
   
     return but;  
 }  
   
 static void  
 osm_gps_map_osd_shape_shadow(cairo_t *cr) {  
     cairo_set_source_rgba (cr, 0, 0, 0, 0.2);  
     cairo_fill (cr);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_shape(cairo_t *cr) {  
     cairo_set_source_rgb (cr, 1, 1, 1);  
     cairo_fill_preserve (cr);  
     cairo_set_source_rgb (cr, OSD_COLOR);  
     cairo_set_line_width (cr, 1);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_dpad_labels(cairo_t *cr, gint x, gint y) {  
     /* move reference to dpad center */  
     x += D_RAD;  
     y += D_RAD;  
   
     const static gint offset[][3][2] = {  
         /* left arrow/triangle */  
         { { -D_TIP+D_LEN, -D_WID }, { -D_LEN, D_WID }, { +D_LEN, D_WID } },  
         /* right arrow/triangle */  
         { { +D_TIP-D_LEN, -D_WID }, { +D_LEN, D_WID }, { -D_LEN, D_WID } },  
         /* top arrow/triangle */  
         { { -D_WID, -D_TIP+D_LEN }, { D_WID, -D_LEN }, { D_WID, +D_LEN } },  
         /* bottom arrow/triangle */  
         { { -D_WID, +D_TIP-D_LEN }, { D_WID, +D_LEN }, { D_WID, -D_LEN } }  
     };  
   
     int i;  
     for(i=0;i<4;i++) {  
         cairo_move_to (cr, x + offset[i][0][0], y + offset[i][0][1]);  
         cairo_rel_line_to (cr, offset[i][1][0], offset[i][1][1]);  
         cairo_rel_line_to (cr, offset[i][2][0], offset[i][2][1]);  
     }  
 }  
   
 /* draw the sattelite dish icon in the center of the dpad */  
 #define GPS_V0  (D_RAD/8)  
 #define GPS_V1  (D_RAD/10)  
 #define GPS_V2  (D_RAD/5)  
   
 /* draw a satellite receiver dish */  
 static void  
 osm_gps_map_osd_dpad_gps(cairo_t *cr, gint x, gint y) {  
     /* move reference to dpad center */  
     x += D_RAD;  
     y += D_RAD + GPS_V0;  
   
     cairo_move_to (cr, x-GPS_V0, y+GPS_V0);  
     cairo_rel_line_to (cr, +GPS_V0, -GPS_V0);  
     cairo_rel_line_to (cr, +GPS_V0, +GPS_V0);  
     cairo_close_path (cr);  
   
     cairo_move_to (cr, x+GPS_V1-GPS_V2, y-2*GPS_V2);  
     cairo_curve_to (cr, x-GPS_V2, y, x+GPS_V1, y+GPS_V1, x+GPS_V1+GPS_V2, y);  
     cairo_close_path (cr);  
   
     x += GPS_V1;  
     cairo_move_to (cr, x, y-GPS_V2);  
     cairo_rel_line_to (cr, +GPS_V1, -GPS_V1);  
 }  
   
 #define Z_LEN  (2*Z_RAD/3)  
   
 static void  
 osm_gps_map_osd_zoom_labels(cairo_t *cr, gint x, gint y) {  
     cairo_move_to (cr, x + Z_LEFT  - Z_LEN, y + Z_MID);  
     cairo_line_to (cr, x + Z_LEFT  + Z_LEN, y + Z_MID);  
   
     cairo_move_to (cr, x + Z_RIGHT,         y + Z_MID - Z_LEN);  
     cairo_line_to (cr, x + Z_RIGHT,         y + Z_MID + Z_LEN);  
     cairo_move_to (cr, x + Z_RIGHT - Z_LEN, y + Z_MID);  
     cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);  
 }  
   
 static void  
 osm_gps_map_osd_labels(cairo_t *cr, gint width, gboolean enabled) {  
     if(enabled)  cairo_set_source_rgb (cr, OSD_COLOR);  
     else         cairo_set_source_rgb (cr, OSD_COLOR_DISABLED);  
     cairo_set_line_width (cr, width);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_labels_shadow(cairo_t *cr, gint width, gboolean enabled) {  
     cairo_set_source_rgba (cr, 0, 0, 0, enabled?0.3:0.15);  
     cairo_set_line_width (cr, width);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_render(OsmGpsMapPrivate *priv) {  
   
     /* first fill with transparency */  
     cairo_t *cr = cairo_create(priv->osd.overlay);  
     cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);  
     cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);  
     cairo_paint(cr);  
   
     cairo_set_operator(cr, CAIRO_OPERATOR_OVER);  
   
     /* --------- draw zoom and dpad shape shadow ----------- */  
     gint x = 0, y = 0;  
   
     osm_gps_map_osd_zoom_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);  
     osm_gps_map_osd_shape_shadow(cr);  
     osm_gps_map_osd_dpad_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);  
     osm_gps_map_osd_shape_shadow(cr);  
   
     /* --------- draw zoom and dpad shape ----------- */  
   
     osm_gps_map_osd_zoom_shape(cr, x, y);  
     osm_gps_map_osd_shape(cr);  
     osm_gps_map_osd_dpad_shape(cr, x, y);  
     osm_gps_map_osd_shape(cr);  
   
     /* --------- draw zoom and dpad labels --------- */  
   
     osm_gps_map_osd_zoom_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);  
     osm_gps_map_osd_dpad_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);  
     osm_gps_map_osd_labels_shadow(cr, Z_RAD/3, TRUE);  
     osm_gps_map_osd_dpad_gps(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);  
     osm_gps_map_osd_labels_shadow(cr, Z_RAD/6, priv->osd.cb != NULL);  
   
     osm_gps_map_osd_zoom_labels(cr, x, y);  
     osm_gps_map_osd_dpad_labels(cr, x, y);  
     osm_gps_map_osd_labels(cr, Z_RAD/3, TRUE);  
     osm_gps_map_osd_dpad_gps(cr, x, y);  
     osm_gps_map_osd_labels(cr, Z_RAD/6, priv->osd.cb != NULL);  
   
     cairo_destroy(cr);  
 }  
   
 static void  
 osm_gps_map_osd_draw_controls (OsmGpsMap *map, gint xoffset, gint yoffset)  
1470  {  {
1471      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1472    
1473      /* backup previous contents */      priv->idle_map_redraw = 0;
     if(!priv->osd.backup)  
         priv->osd.backup = gdk_pixmap_new(priv->pixmap, OSD_W+2, OSD_H+2, -1);  
   
     gint x = OSD_X + EXTRA_BORDER + xoffset;  
     gint y = OSD_Y + EXTRA_BORDER + yoffset;  
   
     /* create backup of background */  
     gdk_draw_drawable(priv->osd.backup,  
         GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],  
                       priv->pixmap, x-1, y-1, 0, 0, OSD_W+2, OSD_H+2);  
   
     priv->osd.backup_x = x-1;  
     priv->osd.backup_y = y-1;  
   
   
 #ifdef USE_CAIRO  
     /* OSD itself uses some off-screen rendering, so check if the */  
     /* offscreen buffer is present and create it if not */  
     if(!priv->osd.overlay) {  
         /* create overlay ... */  
         priv->osd.overlay =  
             cairo_image_surface_create(CAIRO_FORMAT_ARGB32, OSD_W, OSD_H);  
         /* ... and render it */  
         osm_gps_map_osd_render(priv);  
     }  
   
     // now draw this onto the original context  
     cairo_t *cr = gdk_cairo_create(priv->pixmap);  
     cairo_set_source_surface(cr, priv->osd.overlay, x, y);  
     cairo_paint(cr);  
     cairo_destroy(cr);  
   
 #else  
 #warning "OSD control display lacks a non-cairo implementation!"  
 #endif  
 }  
   
 static void  
 osm_gps_map_osd_restore (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
1474    
1475      /* restore backup of previous contents */      /* don't redraw the entire map while the OSD is doing */
1476      if(priv->osd.backup) {      /* some animation or the like. This is to keep the animation */
1477          /* create backup of background */      /* fluid */
1478          gdk_draw_drawable(priv->pixmap,      if (priv->osd->busy(priv->osd))
1479              GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],          return FALSE;
                       priv->osd.backup, 0, 0,  
                       priv->osd.backup_x, priv->osd.backup_y, OSD_W+2, OSD_H+2);  
     }  
 }  
1480    
1481    #ifdef DRAG_DEBUG
1482        printf("trying redraw\n");
1483  #endif  #endif
1484    
 static gboolean  
 osm_gps_map_map_redraw (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     priv->idle_map_redraw = 0;  
   
1485      /* the motion_notify handler uses priv->pixmap to redraw the area; if we      /* the motion_notify handler uses priv->pixmap to redraw the area; if we
1486       * change it while we are dragging, we will end up showing it in the wrong       * change it while we are dragging, we will end up showing it in the wrong
1487       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1780  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1489  osm_gps_map_map_redraw (OsmGpsMap *map)
1489      if (priv->dragging)      if (priv->dragging)
1490          return FALSE;          return FALSE;
1491    
1492        /* undo all offsets that may have happened when dragging */
1493        priv->drag_mouse_dx = 0;
1494        priv->drag_mouse_dy = 0;
1495    
1496      priv->redraw_cycle++;      priv->redraw_cycle++;
1497    
1498      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1799  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1512  osm_gps_map_map_redraw (OsmGpsMap *map)
1512  #ifdef ENABLE_BALLOON  #ifdef ENABLE_BALLOON
1513      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1514  #endif  #endif
1515    
1516  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1517      osm_gps_map_osd_draw_controls(map, 0, 0);      /* OSD may contain a coordinate/scale, so we may have to re-render it */
1518        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1519            priv->osd->render (priv->osd);
1520  #endif  #endif
1521    
     //osm_gps_map_osd_speed(map, 1.5);  
1522      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1523      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1524    
# Line 1819  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1534  osm_gps_map_map_redraw_idle (OsmGpsMap *
1534          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);
1535  }  }
1536    
1537    #ifdef OSM_GPS_MAP_KEYS
1538    static gboolean
1539    on_window_key_press(GtkWidget *widget,
1540                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1541      gboolean handled = FALSE;
1542      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1543    
1544      // the map handles some keys on its own ...
1545      switch(event->keyval) {
1546    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1547      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1548          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1549          if(!priv->fullscreen)
1550              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1551          else
1552              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1553    
1554          priv->fullscreen = !priv->fullscreen;
1555          handled = TRUE;
1556          } break;
1557    #endif
1558    
1559    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1560      case OSM_GPS_MAP_KEY_ZOOMIN:
1561          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1562          handled = TRUE;
1563          break;
1564    #endif
1565    
1566    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1567      case OSM_GPS_MAP_KEY_ZOOMOUT:
1568          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1569          handled = TRUE;
1570          break;
1571    #endif
1572    
1573    #ifdef OSM_GPS_MAP_KEY_UP
1574      case OSM_GPS_MAP_KEY_UP:
1575          priv->map_y -= step;
1576          priv->center_coord_set = FALSE;
1577          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1578          handled = TRUE;
1579          break;
1580    #endif
1581    
1582    #ifdef OSM_GPS_MAP_KEY_DOWN
1583      case OSM_GPS_MAP_KEY_DOWN:
1584          priv->map_y += step;
1585          priv->center_coord_set = FALSE;
1586          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1587          handled = TRUE;
1588          break;
1589    #endif
1590    
1591    #ifdef OSM_GPS_MAP_KEY_LEFT
1592      case OSM_GPS_MAP_KEY_LEFT:
1593          priv->map_x -= step;
1594          priv->center_coord_set = FALSE;
1595          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1596          handled = TRUE;
1597          break;
1598    #endif
1599    
1600    #ifdef OSM_GPS_MAP_KEY_RIGHT
1601      case OSM_GPS_MAP_KEY_RIGHT:
1602          priv->map_x += step;
1603          priv->center_coord_set = FALSE;
1604          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1605          handled = TRUE;
1606          break;
1607    #endif
1608    
1609      default:
1610          break;
1611      }
1612    
1613      return handled;
1614    }
1615    #endif
1616    
1617  static void  static void
1618  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1619  {  {
# Line 1832  osm_gps_map_init (OsmGpsMap *object) Line 1627  osm_gps_map_init (OsmGpsMap *object)
1627      priv->trip_history = NULL;      priv->trip_history = NULL;
1628      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1629      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1630        priv->gps_heading = OSM_GPS_MAP_INVALID;
1631    
1632  #ifdef ENABLE_BALLOON  #ifdef ENABLE_BALLOON
1633      priv->balloon.coo = g_new0(coord_t, 1);      priv->balloon.coo = g_new0(coord_t, 1);
# Line 1840  osm_gps_map_init (OsmGpsMap *object) Line 1636  osm_gps_map_init (OsmGpsMap *object)
1636  #endif  #endif
1637    
1638  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1639      priv->osd.backup = NULL;      priv->osd = NULL;
1640      priv->osd.overlay = NULL;  #endif
1641      priv->osd.cb = NULL;  
1642    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1643        priv->fullscreen = FALSE;
1644  #endif  #endif
1645    
1646      priv->tracks = NULL;      priv->tracks = NULL;
# Line 1861  osm_gps_map_init (OsmGpsMap *object) Line 1659  osm_gps_map_init (OsmGpsMap *object)
1659    
1660  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1661      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1662      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1663                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1664                                                               "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11",                                              USER_AGENT, NULL);
                                                              NULL);  
1665  #else  #else
1666      /* libsoup-2.2 seems not to be able to set the user agent */      /* libsoup-2.2 has no special way to set the user agent, so we */
1667        /* set it seperately as an extra header field for each reuest */
1668      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1669  #endif  #endif
1670    
# Line 1889  osm_gps_map_init (OsmGpsMap *object) Line 1687  osm_gps_map_init (OsmGpsMap *object)
1687      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1688    
1689      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);
 }  
1690    
1691  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1692  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1693  static char *simple_hash(char *str) {                       G_CALLBACK(on_window_key_press), priv);
     union {  
         char str[4];  
         gulong val;  
     } hash = { .val = 0x55555555 };  
   
     while(*str) {  
         hash.str[(int)str & 3] ^= *str;  
         str++;  
     }  
     return g_strdup_printf("%08lX", hash.val);  
 }  
1694  #endif  #endif
1695    }
1696    
1697  static GObject *  static void
1698  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1699      const char *uri;      const char *uri;
1700    
     //Always chain up to the parent constructor  
     object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);  
     map = OSM_GPS_MAP(object);  
     priv = OSM_GPS_MAP_PRIVATE(object);  
   
1701      //user can specify a map source ID, or a repo URI as the map source      //user can specify a map source ID, or a repo URI as the map source
1702      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1703      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1944  osm_gps_map_constructor (GType gtype, gu Line 1722  osm_gps_map_constructor (GType gtype, gu
1722          }          }
1723      }      }
1724    
1725      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1726  #ifdef G_CHECKSUM_MD5      if(!fname) fname = "_unknown_";
         char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);  
 #else  
         char *md5 = simple_hash(priv->repo_uri);  
 #endif  
1727    
1728          if (priv->cache_dir) {      if (priv->tile_dir) {
1729              char *old = priv->cache_dir;          //the new cachedir is the given cache dir + the friendly name of the repo_uri
1730              //the new cachedir is the given cache dir + the md5 of the repo_uri          priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1731              priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);          g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
             g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);  
             g_free(old);  
         } else {  
             //the new cachedir is the current dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup(md5);  
         }  
   
         g_free(md5);  
1732      }      }
1733    }
1734    
1735    static GObject *
1736    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1737    {
1738        //Always chain up to the parent constructor
1739        GObject *object =
1740            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1741    
1742      inspect_map_uri(map);      osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1743    
1744        inspect_map_uri(OSM_GPS_MAP(object));
1745    
1746      return object;      return object;
1747  }  }
# Line 2009  osm_gps_map_dispose (GObject *object) Line 1785  osm_gps_map_dispose (GObject *object)
1785  #endif  #endif
1786    
1787  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1788      if (priv->osd.backup)      if(priv->osd)
1789          g_object_unref(priv->osd.backup);          priv->osd->free(priv->osd);
1790    
1791      if (priv->osd.overlay)  #ifdef OSD_DOUBLE_BUFFER
1792           cairo_surface_destroy(priv->osd.overlay);      if(priv->dbuf_pixmap)
1793            g_object_unref (priv->dbuf_pixmap);
1794    #endif
1795  #endif  #endif
1796    
1797      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
# Line 2025  osm_gps_map_finalize (GObject *object) Line 1803  osm_gps_map_finalize (GObject *object)
1803      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1804      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1805    
1806      g_free(priv->cache_dir);      if(priv->tile_dir)
1807            g_free(priv->tile_dir);
1808    
1809        if(priv->cache_dir)
1810            g_free(priv->cache_dir);
1811    
1812      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1813      g_free(priv->image_format);      g_free(priv->image_format);
1814    
# Line 2082  osm_gps_map_set_property (GObject *objec Line 1865  osm_gps_map_set_property (GObject *objec
1865              break;              break;
1866          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1867              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1868                  priv->cache_dir = g_value_dup_string (value);                  priv->tile_dir = g_value_dup_string (value);
             break;  
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             priv->cache_dir_is_full_path = g_value_get_boolean (value);  
1869              break;              break;
1870          case PROP_ZOOM:          case PROP_ZOOM:
1871              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 2113  osm_gps_map_set_property (GObject *objec Line 1893  osm_gps_map_set_property (GObject *objec
1893          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1894              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1895              break;              break;
1896          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1897                gint old = priv->map_source;
1898              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1899              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1900                   priv->map_source != old &&
1901                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1902                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1903    
1904                    /* we now have to switch the entire map */
1905    
1906                    /* flush the ram cache */
1907                    g_hash_table_remove_all(priv->tile_cache);
1908    
1909                    osm_gps_map_setup(priv);
1910    
1911                    inspect_map_uri(map);
1912    
1913                    /* adjust zoom if necessary */
1914                    if(priv->map_zoom > priv->max_zoom)
1915                        osm_gps_map_set_zoom(map, priv->max_zoom);
1916    
1917                    if(priv->map_zoom < priv->min_zoom)
1918                        osm_gps_map_set_zoom(map, priv->min_zoom);
1919    
1920                } } break;
1921          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1922              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1923              break;              break;
# Line 2156  osm_gps_map_get_property (GObject *objec Line 1958  osm_gps_map_get_property (GObject *objec
1958          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1959              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1960              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1961          case PROP_ZOOM:          case PROP_ZOOM:
1962              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1963              break;              break;
# Line 2243  osm_gps_map_button_press (GtkWidget *wid Line 2042  osm_gps_map_button_press (GtkWidget *wid
2042  #endif  #endif
2043    
2044  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
     #define SCROLL_STEP 10  
   
2045      /* pressed inside OSD control? */      /* pressed inside OSD control? */
2046      osd_button_t but = osm_gps_map_osd_check(event->x, event->y);      if(priv->osd) {
2047      if(but != OSD_NONE)          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
2048      {          if(but != OSD_NONE)
2049          priv->drag_counter = -1;          {
2050                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
2051          switch(but) {              priv->drag_counter = -1;
2052          case OSD_GPS:  
2053              priv->osd.cb(priv->osd.data);              switch(but) {
2054              break;              case OSD_UP:
2055                    priv->map_y -= step;
2056          case OSD_UP:                  priv->center_coord_set = FALSE;
2057              priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2058              priv->center_coord_set = FALSE;                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2059              break;                  break;
   
         case OSD_DOWN:  
             priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_LEFT:  
             priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_RIGHT:  
             priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_IN:  
             osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);  
             break;  
2060    
2061          case OSD_OUT:              case OSD_DOWN:
2062              osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);                  priv->map_y += step;
2063              break;                  priv->center_coord_set = FALSE;
2064                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2065                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2066                    break;
2067    
2068          default:              case OSD_LEFT:
2069              break;                  priv->map_x -= step;
2070                    priv->center_coord_set = FALSE;
2071                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2072                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2073                    break;
2074    
2075                case OSD_RIGHT:
2076                    priv->map_x += step;
2077                    priv->center_coord_set = FALSE;
2078                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2079                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2080                    break;
2081    
2082                case OSD_IN:
2083                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
2084                    break;
2085    
2086                case OSD_OUT:
2087                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
2088                    break;
2089    
2090                default:
2091                    /* all custom buttons are forwarded to the application */
2092                    if(priv->osd->cb)
2093                        priv->osd->cb(but, priv->osd->data);
2094                    break;
2095                }
2096    
2097                return FALSE;
2098          }          }
   
         osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
         return FALSE;  
2099      }      }
2100  #endif  #endif
2101    
# Line 2335  osm_gps_map_button_release (GtkWidget *w Line 2140  osm_gps_map_button_release (GtkWidget *w
2140          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2141      }      }
2142    
2143      priv->drag_mouse_dx = 0;  #ifdef DRAG_DEBUG
2144      priv->drag_mouse_dy = 0;      printf("dragging done\n");
2145    #endif
2146    
2147      priv->drag_counter = -1;      priv->drag_counter = -1;
2148    
2149      return FALSE;      return FALSE;
# Line 2374  osm_gps_map_motion_notify (GtkWidget *wi Line 2181  osm_gps_map_motion_notify (GtkWidget *wi
2181      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2182          return FALSE;          return FALSE;
2183    
2184  #ifdef USE_MAEMO  #ifdef OSM_GPS_MAP_REFRESH
2185      /* reduce update frequency on maemo to keep screen update fluid */      /* reduce update frequency on maemo to keep screen update fluid */
2186      static guint32 last_time = 0;      static guint32 last_time = 0;
2187    
2188      if(event->time - last_time < 100) return FALSE;      if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2189      last_time = event->time;      last_time = event->time;
2190  #endif  #endif
2191    
# Line 2390  osm_gps_map_motion_notify (GtkWidget *wi Line 2197  osm_gps_map_motion_notify (GtkWidget *wi
2197      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2198      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2199    
 #ifdef ENABLE_OSD  
     /* undo OSD */  
     osm_gps_map_osd_restore (OSM_GPS_MAP(widget));  
   
     /* draw new OSD */  
     osm_gps_map_osd_draw_controls (OSM_GPS_MAP(widget),  
                                    -priv->drag_mouse_dx,  
                                    -priv->drag_mouse_dy);  
 #endif  
   
2200      osm_gps_map_expose (widget, NULL);      osm_gps_map_expose (widget, NULL);
2201    
   
2202      return FALSE;      return FALSE;
2203  }  }
2204    
# Line 2416  osm_gps_map_configure (GtkWidget *widget Line 2212  osm_gps_map_configure (GtkWidget *widget
2212          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2213    
2214      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2215                                     widget->window,                          widget->window,
2216                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2217                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2218                                     -1);                          -1);
2219    
2220    #ifdef ENABLE_OSD
2221    
2222    #ifdef OSD_DOUBLE_BUFFER
2223        if (priv->dbuf_pixmap)
2224            g_object_unref (priv->dbuf_pixmap);
2225    
2226        priv->dbuf_pixmap = gdk_pixmap_new (
2227                            widget->window,
2228                            widget->allocation.width,
2229                            widget->allocation.height,
2230                            -1);
2231    #endif
2232    
2233        /* the osd needs some references to map internal objects */
2234        if(priv->osd)
2235            priv->osd->widget = widget;
2236    #endif
2237    
2238      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2239      if(priv->gc_map)      if(priv->gc_map)
# Line 2437  osm_gps_map_expose (GtkWidget *widget, G Line 2251  osm_gps_map_expose (GtkWidget *widget, G
2251  {  {
2252      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2253    
2254      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2255                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2256                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  #else
2257                         priv->pixmap,      GdkDrawable *drawable = widget->window;
2258                         0,0,  #endif
2259                         priv->drag_mouse_dx - EXTRA_BORDER,  
2260                         priv->drag_mouse_dy - EXTRA_BORDER,  #ifdef DRAG_DEBUG
2261                         -1,-1);      printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2262    #endif
2263      //Paint white outside of the map if dragging. Its less  
2264      //ugly than painting the corrupted map      if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2265      if(priv->drag_mouse_dx>EXTRA_BORDER) {      {
2266          gdk_draw_rectangle (  #ifdef DRAG_DEBUG
2267                              widget->window,          printf("  dragging = %d, event = %p\n", priv->dragging, event);
2268                              widget->style->white_gc,  #endif
2269                              TRUE,  
2270                              0, 0,          gdk_draw_drawable (drawable,
2271                              priv->drag_mouse_dx - EXTRA_BORDER,                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2272                              widget->allocation.height);                             priv->pixmap,
2273      }                             event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2274      else if (-priv->drag_mouse_dx > EXTRA_BORDER)                             event->area.x, event->area.y,
2275      {                             event->area.width, event->area.height);
2276          gdk_draw_rectangle (      }
2277                              widget->window,      else
2278                              widget->style->white_gc,      {
2279                              TRUE,  #ifdef DRAG_DEBUG
2280                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,          printf("  drag_mouse %d/%d\n",
2281                              -priv->drag_mouse_dx - EXTRA_BORDER,                 priv->drag_mouse_dx - EXTRA_BORDER,
2282                              widget->allocation.height);                 priv->drag_mouse_dy - EXTRA_BORDER);
2283      }  #endif
2284    
2285      if (priv->drag_mouse_dy>EXTRA_BORDER) {          gdk_draw_drawable (drawable,
2286          gdk_draw_rectangle (                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2287                              widget->window,                             priv->pixmap,
2288                              widget->style->white_gc,                             0,0,
2289                              TRUE,                             priv->drag_mouse_dx - EXTRA_BORDER,
2290                              0, 0,                             priv->drag_mouse_dy - EXTRA_BORDER,
2291                              widget->allocation.width,                             -1,-1);
2292                              priv->drag_mouse_dy - EXTRA_BORDER);  
2293      }          //Paint white outside of the map if dragging. Its less
2294      else if (-priv->drag_mouse_dy > EXTRA_BORDER)          //ugly than painting the corrupted map
2295      {          if(priv->drag_mouse_dx>EXTRA_BORDER) {
2296          gdk_draw_rectangle (              gdk_draw_rectangle (drawable,
2297                              widget->window,                                  widget->style->white_gc,
2298                              widget->style->white_gc,                                  TRUE,
2299                              TRUE,                                  0, 0,
2300                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,                                  priv->drag_mouse_dx - EXTRA_BORDER,
2301                              widget->allocation.width,                                  widget->allocation.height);
2302                              -priv->drag_mouse_dy - EXTRA_BORDER);          }
2303      }          else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2304  #if 0          {
2305      if(!priv->dragging)              gdk_draw_rectangle (drawable,
2306          gdk_draw_drawable (                                  widget->style->white_gc,
2307                         widget->window,                                  TRUE,
2308                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2309                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2310                                    widget->allocation.height);
2311            }
2312    
2313            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2314                gdk_draw_rectangle (drawable,
2315                                    widget->style->white_gc,
2316                                    TRUE,
2317                                    0, 0,
2318                                    widget->allocation.width,
2319                                    priv->drag_mouse_dy - EXTRA_BORDER);
2320            }
2321            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2322            {
2323                gdk_draw_rectangle (drawable,
2324                                    widget->style->white_gc,
2325                                    TRUE,
2326                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2327                                    widget->allocation.width,
2328                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2329            }
2330        }
2331    
2332    #ifdef ENABLE_OSD
2333        /* draw new OSD */
2334        if(priv->osd)
2335            priv->osd->draw (priv->osd, drawable);
2336    
2337    #ifdef OSD_DOUBLE_BUFFER
2338        gdk_draw_drawable (widget->window,
2339                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2340                         priv->pixmap,                         priv->dbuf_pixmap,
2341                         event->area.x + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2342                         event->area.y + EXTRA_BORDER,  #endif
2343                         event->area.x, event->area.y,  
                        event->area.width, event->area.height);  
2344  #endif  #endif
2345    
2346      return FALSE;      return FALSE;
2347  }  }
2348    
# Line 2579  osm_gps_map_class_init (OsmGpsMapClass * Line 2424  osm_gps_map_class_init (OsmGpsMapClass *
2424                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2425    
2426      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
                                      PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
                                      g_param_spec_boolean ("tile-cache-is-full-path",  
                                                            "tile cache is full path",  
                                                            "if true, the path passed to tile-cache is interpreted as the full cache path",  
                                                            FALSE,  
                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));  
   
     g_object_class_install_property (object_class,  
2427                                       PROP_ZOOM,                                       PROP_ZOOM,
2428                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2429                                                         "zoom",                                                         "zoom",
# Line 2704  osm_gps_map_class_init (OsmGpsMapClass * Line 2541  osm_gps_map_class_init (OsmGpsMapClass *
2541                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2542                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2543                                                         -1,                                                         -1,
2544                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2545    
2546      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2547                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2723  osm_gps_map_source_get_friendly_name(Osm Line 2560  osm_gps_map_source_get_friendly_name(Osm
2560          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2561              return "None";              return "None";
2562          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2563              return "OpenStreetMap";              return "OpenStreetMap I";
2564          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2565              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2566          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2567              return "OpenAerialMap";              return "OpenCycleMap";
2568            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2569                return "OSMC Trails";
2570          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2571              return "Maps-For-Free";              return "Maps-For-Free";
2572          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2769  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2608  osm_gps_map_source_get_repo_uri(OsmGpsMa
2608              return OSM_REPO_URI;              return OSM_REPO_URI;
2609          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2610              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2611          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2612              return "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z/#X/#Y.jpg";              return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2613            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2614                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2615          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2616              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2617          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2808  osm_gps_map_source_get_image_format(OsmG Line 2649  osm_gps_map_source_get_image_format(OsmG
2649          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2650          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2651          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2652            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2653            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2654              return "png";              return "png";
2655          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2656          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2657            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2658          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2659          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2660          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2818  osm_gps_map_source_get_image_format(OsmG Line 2662  osm_gps_map_source_get_image_format(OsmG
2662          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2663          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2664          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
         case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:  
         case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:  
2665              return "jpg";              return "jpg";
2666          default:          default:
2667              return "bin";              return "bin";
# Line 2841  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2683  osm_gps_map_source_get_max_zoom(OsmGpsMa
2683          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2684              return 18;              return 18;
2685          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2686            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2687              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2688          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2689          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2690          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2691          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2853  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2695  osm_gps_map_source_get_max_zoom(OsmGpsMa
2695          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2696          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2697              return 17;              return 17;
2698            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2699                return 15;
2700          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2701              return 11;              return 11;
2702          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2992  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2836  osm_gps_map_set_zoom (OsmGpsMap *map, in
2836          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2837                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2838    
2839    #ifdef ENABLE_OSD
2840            /* OSD may contain a scale, so we may have to re-render it */
2841            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2842                priv->osd->render (priv->osd);
2843    #endif
2844    
2845          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2846      }      }
2847      return priv->map_zoom;      return priv->map_zoom;
# Line 3077  osm_gps_map_clear_images (OsmGpsMap *map Line 2927  osm_gps_map_clear_images (OsmGpsMap *map
2927  }  }
2928    
2929  void  void
 osm_gps_map_osd_speed (OsmGpsMap *map, float speed)  
 {  
     OsmGpsMapPrivate *priv;  
   
     PangoContext        *context = NULL;  
     PangoLayout     *layout  = NULL;  
     PangoFontDescription    *desc    = NULL;  
   
     GdkColor color;  
     GdkGC *gc;  
   
     gchar *buffer;  
     //static int x = 10, y = 10;  
     static int width = 0, height = 0;  
   
     g_return_if_fail (OSM_IS_GPS_MAP (map));  
     priv = map->priv;  
   
     buffer = g_strdup_printf("%.0f", speed);  
   
     /* pango initialisation */  
     context = gtk_widget_get_pango_context (GTK_WIDGET(map));  
     layout  = pango_layout_new (context);  
     desc    = pango_font_description_new();  
   
     pango_font_description_set_size (desc, 40 * PANGO_SCALE);  
     pango_layout_set_font_description (layout, desc);  
     pango_layout_set_text (layout, buffer, strlen(buffer));  
   
     gc = gdk_gc_new (GTK_WIDGET(map)->window);  
   
     color.red = (0 > 50) ? 0xffff : 0;  
     color.green = 0;  
     color.blue = 0;  
   
     gdk_gc_set_rgb_fg_color (gc, &color);  
   
     /* faster / less flicker alternative:*/  
     gdk_draw_drawable (  
                        GTK_WIDGET(map)->window,  
                        GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(map)],  
                        priv->pixmap,  
                        0,0,  
                        0,0,  
                        width+10,width+10);  
   
     gdk_draw_layout(GTK_WIDGET(map)->window,  
                     gc,  
                     0, 0,  
                     layout);  
   
     /* set width and height */  
     pango_layout_get_pixel_size(layout, &width, &height);  
   
     g_free(buffer);  
     pango_font_description_free (desc);  
     g_object_unref (layout);  
     g_object_unref (gc);  
 }  
   
 void  
2930  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)
2931  {  {
2932      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 3149  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2938  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2938      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2939      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2940      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2941        priv->gps_heading = deg2rad(heading);
2942    
2943      // pixel_x,y, offsets      // pixel_x,y, offsets
2944      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 3255  osm_gps_map_scroll (OsmGpsMap *map, gint Line 3045  osm_gps_map_scroll (OsmGpsMap *map, gint
3045      priv->map_x += dx;      priv->map_x += dx;
3046      priv->map_y += dy;      priv->map_y += dy;
3047    
3048    #ifdef ENABLE_OSD
3049        /* OSD may contain a coordinate, so we may have to re-render it */
3050        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
3051            priv->osd->render (priv->osd);
3052    #endif
3053    
3054      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
3055  }  }
3056    
# Line 3263  osm_gps_map_get_scale(OsmGpsMap *map) Line 3059  osm_gps_map_get_scale(OsmGpsMap *map)
3059  {  {
3060      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
3061    
3062      g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_NAN);      g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_GPS_MAP_INVALID);
3063      priv = map->priv;      priv = map->priv;
3064    
3065      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
# Line 3308  osm_gps_map_clear_balloon (OsmGpsMap *ma Line 3104  osm_gps_map_clear_balloon (OsmGpsMap *ma
3104  #endif  #endif
3105    
3106  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
3107  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdGpsCallback cb, gpointer data) {  
3108    void
3109    osm_gps_map_redraw (OsmGpsMap *map)
3110    {
3111        osm_gps_map_map_redraw_idle(map);
3112    }
3113    
3114    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
3115        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
3116        return map->priv->osd;
3117    }
3118    
3119    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
3120      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
3121    
3122      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
     priv = map->priv;  
3123    
3124      priv->osd.cb = cb;      priv = map->priv;
3125      priv->osd.data = data;      g_return_if_fail (!priv->osd);
3126    
3127      /* this may have changed the state of the gps button */      priv->osd = osd;
3128      /* we thus re-render the overlay */  }
     osm_gps_map_osd_render(priv);  
3129    
3130      osm_gps_map_map_redraw_idle(map);  void
3131    osm_gps_map_repaint (OsmGpsMap *map) {
3132        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3133  }  }
3134    
3135  #endif  #endif
Legend:
Removed from v.68  
changed lines
  Added in v.111