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

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

revision 69 by harbaum, Thu Aug 20 18:54:06 2009 UTC revision 105 by harbaum, Wed Sep 9 19:57:45 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);  
 }  
   
 static gboolean  
 osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)  
 {  
     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;  
 }  
   
 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)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     /* backup previous contents */  
     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;  
   
     /* restore backup of previous contents */  
     if(priv->osd.backup) {  
         /* create backup of background */  
         gdk_draw_drawable(priv->pixmap,  
             GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],  
                       priv->osd.backup, 0, 0,  
                       priv->osd.backup_x, priv->osd.backup_y, OSD_W+2, OSD_H+2);  
     }  
 }  
   
 #endif  
   
1468  static gboolean  static gboolean
1469  osm_gps_map_map_redraw (OsmGpsMap *map)  osm_gps_map_map_redraw (OsmGpsMap *map)
1470  {  {
# Line 1761  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1472  osm_gps_map_map_redraw (OsmGpsMap *map)
1472    
1473      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1474    
1475        /* don't redraw the entire map while the OSD is doing */
1476        /* some animation or the like. This is to keep the animation */
1477        /* fluid */
1478        if (priv->osd->busy(priv->osd))
1479            return FALSE;
1480    
1481      /* 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
1482       * 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
1483       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1787  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1504  osm_gps_map_map_redraw (OsmGpsMap *map)
1504  #ifdef ENABLE_BALLOON  #ifdef ENABLE_BALLOON
1505      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1506  #endif  #endif
 #ifdef ENABLE_OSD  
     osm_gps_map_osd_draw_controls(map, 0, 0);  
 #endif  
1507    
1508      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1509      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
# Line 1807  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1521  osm_gps_map_map_redraw_idle (OsmGpsMap *
1521          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);
1522  }  }
1523    
1524    #ifdef OSM_GPS_MAP_KEYS
1525    static gboolean
1526    on_window_key_press(GtkWidget *widget,
1527                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1528      gboolean handled = FALSE;
1529      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1530    
1531      // the map handles some keys on its own ...
1532      switch(event->keyval) {
1533    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1534      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1535          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1536          if(!priv->fullscreen)
1537              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1538          else
1539              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1540    
1541          priv->fullscreen = !priv->fullscreen;
1542          handled = TRUE;
1543          } break;
1544    #endif
1545    
1546    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1547      case OSM_GPS_MAP_KEY_ZOOMIN:
1548          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1549          handled = TRUE;
1550          break;
1551    #endif
1552    
1553    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1554      case OSM_GPS_MAP_KEY_ZOOMOUT:
1555          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1556          handled = TRUE;
1557          break;
1558    #endif
1559    
1560    #ifdef OSM_GPS_MAP_KEY_UP
1561      case OSM_GPS_MAP_KEY_UP:
1562          priv->map_y -= step;
1563          priv->center_coord_set = FALSE;
1564          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1565          handled = TRUE;
1566          break;
1567    #endif
1568    
1569    #ifdef OSM_GPS_MAP_KEY_DOWN
1570      case OSM_GPS_MAP_KEY_DOWN:
1571          priv->map_y += step;
1572          priv->center_coord_set = FALSE;
1573          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1574          handled = TRUE;
1575          break;
1576    #endif
1577    
1578    #ifdef OSM_GPS_MAP_KEY_LEFT
1579      case OSM_GPS_MAP_KEY_LEFT:
1580          priv->map_x -= step;
1581          priv->center_coord_set = FALSE;
1582          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1583          handled = TRUE;
1584          break;
1585    #endif
1586    
1587    #ifdef OSM_GPS_MAP_KEY_RIGHT
1588      case OSM_GPS_MAP_KEY_RIGHT:
1589          priv->map_x += step;
1590          priv->center_coord_set = FALSE;
1591          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1592          handled = TRUE;
1593          break;
1594    #endif
1595    
1596      default:
1597          break;
1598      }
1599    
1600      return handled;
1601    }
1602    #endif
1603    
1604  static void  static void
1605  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1606  {  {
# Line 1820  osm_gps_map_init (OsmGpsMap *object) Line 1614  osm_gps_map_init (OsmGpsMap *object)
1614      priv->trip_history = NULL;      priv->trip_history = NULL;
1615      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1616      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1617        priv->gps_heading = OSM_GPS_MAP_INVALID;
1618    
1619  #ifdef ENABLE_BALLOON  #ifdef ENABLE_BALLOON
1620      priv->balloon.coo = g_new0(coord_t, 1);      priv->balloon.coo = g_new0(coord_t, 1);
# Line 1828  osm_gps_map_init (OsmGpsMap *object) Line 1623  osm_gps_map_init (OsmGpsMap *object)
1623  #endif  #endif
1624    
1625  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1626      priv->osd.backup = NULL;      priv->osd = NULL;
1627      priv->osd.overlay = NULL;  #endif
1628      priv->osd.cb = NULL;  
1629    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1630        priv->fullscreen = FALSE;
1631  #endif  #endif
1632    
1633      priv->tracks = NULL;      priv->tracks = NULL;
# Line 1849  osm_gps_map_init (OsmGpsMap *object) Line 1646  osm_gps_map_init (OsmGpsMap *object)
1646    
1647  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1648      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1649      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1650                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1651                                                               "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);  
1652  #else  #else
1653      /* 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 */
1654        /* set it seperately as an extra header field for each reuest */
1655      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1656  #endif  #endif
1657    
# Line 1877  osm_gps_map_init (OsmGpsMap *object) Line 1674  osm_gps_map_init (OsmGpsMap *object)
1674      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1675    
1676      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);
 }  
1677    
1678  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1679  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1680  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);  
 }  
1681  #endif  #endif
1682    }
1683    
1684  static GObject *  static void
1685  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1686      const char *uri;      const char *uri;
1687    
     //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);  
   
1688      //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
1689      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);
1690      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1932  osm_gps_map_constructor (GType gtype, gu Line 1709  osm_gps_map_constructor (GType gtype, gu
1709          }          }
1710      }      }
1711    
1712      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1713  #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  
   
         if (priv->cache_dir) {  
             char *old = priv->cache_dir;  
             //the new cachedir is the given cache dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);  
             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);  
         }  
1714    
1715          g_free(md5);      if (priv->tile_dir) {
1716            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1717            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1718            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1719      }      }
1720    }
1721    
1722      inspect_map_uri(map);  static GObject *
1723    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1724    {
1725        //Always chain up to the parent constructor
1726        GObject *object =
1727            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1728    
1729        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1730    
1731        inspect_map_uri(OSM_GPS_MAP(object));
1732    
1733      return object;      return object;
1734  }  }
# Line 1997  osm_gps_map_dispose (GObject *object) Line 1772  osm_gps_map_dispose (GObject *object)
1772  #endif  #endif
1773    
1774  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1775      if (priv->osd.backup)      if(priv->osd)
1776          g_object_unref(priv->osd.backup);          priv->osd->free(priv->osd);
1777    
1778      if (priv->osd.overlay)  #ifdef OSD_DOUBLE_BUFFER
1779           cairo_surface_destroy(priv->osd.overlay);      if(priv->dbuf_pixmap)
1780            g_object_unref (priv->dbuf_pixmap);
1781    #endif
1782  #endif  #endif
1783    
1784      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
# Line 2013  osm_gps_map_finalize (GObject *object) Line 1790  osm_gps_map_finalize (GObject *object)
1790      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1791      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1792    
1793      g_free(priv->cache_dir);      if(priv->tile_dir)
1794            g_free(priv->tile_dir);
1795    
1796        if(priv->cache_dir)
1797            g_free(priv->cache_dir);
1798    
1799      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1800      g_free(priv->image_format);      g_free(priv->image_format);
1801    
# Line 2070  osm_gps_map_set_property (GObject *objec Line 1852  osm_gps_map_set_property (GObject *objec
1852              break;              break;
1853          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1854              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1855                  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);  
1856              break;              break;
1857          case PROP_ZOOM:          case PROP_ZOOM:
1858              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 2101  osm_gps_map_set_property (GObject *objec Line 1880  osm_gps_map_set_property (GObject *objec
1880          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1881              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1882              break;              break;
1883          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1884                gint old = priv->map_source;
1885              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1886              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1887                   priv->map_source != old &&
1888                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1889                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1890    
1891                    /* we now have to switch the entire map */
1892    
1893                    /* flush the ram cache */
1894                    g_hash_table_remove_all(priv->tile_cache);
1895    
1896                    osm_gps_map_setup(priv);
1897    
1898                    inspect_map_uri(map);
1899    
1900                    /* adjust zoom if necessary */
1901                    if(priv->map_zoom > priv->max_zoom)
1902                        osm_gps_map_set_zoom(map, priv->max_zoom);
1903    
1904                    if(priv->map_zoom < priv->min_zoom)
1905                        osm_gps_map_set_zoom(map, priv->min_zoom);
1906    
1907                } } break;
1908          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1909              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1910              break;              break;
# Line 2144  osm_gps_map_get_property (GObject *objec Line 1945  osm_gps_map_get_property (GObject *objec
1945          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1946              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1947              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1948          case PROP_ZOOM:          case PROP_ZOOM:
1949              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1950              break;              break;
# Line 2231  osm_gps_map_button_press (GtkWidget *wid Line 2029  osm_gps_map_button_press (GtkWidget *wid
2029  #endif  #endif
2030    
2031  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
     #define SCROLL_STEP 10  
   
2032      /* pressed inside OSD control? */      /* pressed inside OSD control? */
2033      osd_button_t but = osm_gps_map_osd_check(event->x, event->y);      if(priv->osd) {
2034      if(but != OSD_NONE)          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
2035      {          if(but != OSD_NONE)
2036          priv->drag_counter = -1;          {
2037                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
2038          switch(but) {              priv->drag_counter = -1;
2039          case OSD_GPS:  
2040              priv->osd.cb(priv->osd.data);              switch(but) {
2041              break;              case OSD_UP:
2042                    priv->map_y -= step;
2043          case OSD_UP:                  priv->center_coord_set = FALSE;
2044              priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2045              priv->center_coord_set = FALSE;                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2046              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;  
2047    
2048          case OSD_OUT:              case OSD_DOWN:
2049              osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);                  priv->map_y += step;
2050              break;                  priv->center_coord_set = FALSE;
2051                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2052                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2053                    break;
2054    
2055          default:              case OSD_LEFT:
2056              break;                  priv->map_x -= step;
2057                    priv->center_coord_set = FALSE;
2058                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2059                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2060                    break;
2061    
2062                case OSD_RIGHT:
2063                    priv->map_x += step;
2064                    priv->center_coord_set = FALSE;
2065                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2066                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2067                    break;
2068    
2069                case OSD_IN:
2070                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
2071                    break;
2072    
2073                case OSD_OUT:
2074                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
2075                    break;
2076    
2077                default:
2078                    /* all custom buttons are forwarded to the application */
2079                    if(priv->osd->cb)
2080                        priv->osd->cb(but, priv->osd->data);
2081                    break;
2082                }
2083    
2084                return FALSE;
2085          }          }
   
         osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
         return FALSE;  
2086      }      }
2087  #endif  #endif
2088    
# Line 2362  osm_gps_map_motion_notify (GtkWidget *wi Line 2166  osm_gps_map_motion_notify (GtkWidget *wi
2166      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2167          return FALSE;          return FALSE;
2168    
2169  #ifdef USE_MAEMO  #ifdef OSM_GPS_MAP_REFRESH
2170      /* reduce update frequency on maemo to keep screen update fluid */      /* reduce update frequency on maemo to keep screen update fluid */
2171      static guint32 last_time = 0;      static guint32 last_time = 0;
2172    
2173      if(event->time - last_time < 100) return FALSE;      if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2174      last_time = event->time;      last_time = event->time;
2175  #endif  #endif
2176    
# Line 2378  osm_gps_map_motion_notify (GtkWidget *wi Line 2182  osm_gps_map_motion_notify (GtkWidget *wi
2182      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2183      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2184    
 #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  
   
2185      osm_gps_map_expose (widget, NULL);      osm_gps_map_expose (widget, NULL);
2186    
   
2187      return FALSE;      return FALSE;
2188  }  }
2189    
# Line 2404  osm_gps_map_configure (GtkWidget *widget Line 2197  osm_gps_map_configure (GtkWidget *widget
2197          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2198    
2199      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2200                                     widget->window,                          widget->window,
2201                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2202                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2203                                     -1);                          -1);
2204    
2205    #ifdef ENABLE_OSD
2206    
2207    #ifdef OSD_DOUBLE_BUFFER
2208        if (priv->dbuf_pixmap)
2209            g_object_unref (priv->dbuf_pixmap);
2210    
2211        priv->dbuf_pixmap = gdk_pixmap_new (
2212                            widget->window,
2213                            widget->allocation.width,
2214                            widget->allocation.height,
2215                            -1);
2216    #endif
2217    
2218        /* the osd needs some references to map internal objects */
2219        if(priv->osd)
2220            priv->osd->widget = widget;
2221    #endif
2222    
2223      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2224      if(priv->gc_map)      if(priv->gc_map)
# Line 2425  osm_gps_map_expose (GtkWidget *widget, G Line 2236  osm_gps_map_expose (GtkWidget *widget, G
2236  {  {
2237      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2238    
2239      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2240                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2241                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  #else
2242                         priv->pixmap,      GdkDrawable *drawable = widget->window;
2243                         0,0,  #endif
2244                         priv->drag_mouse_dx - EXTRA_BORDER,  
2245                         priv->drag_mouse_dy - EXTRA_BORDER,      if (!priv->dragging && event)
2246                         -1,-1);      {
2247            gdk_draw_drawable (drawable,
2248      //Paint white outside of the map if dragging. Its less                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2249      //ugly than painting the corrupted map                             priv->pixmap,
2250      if(priv->drag_mouse_dx>EXTRA_BORDER) {                             event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2251          gdk_draw_rectangle (                             event->area.x, event->area.y,
2252                              widget->window,                             event->area.width, event->area.height);
2253                              widget->style->white_gc,      }
2254                              TRUE,      else
2255                              0, 0,      {
2256                              priv->drag_mouse_dx - EXTRA_BORDER,          gdk_draw_drawable (drawable,
2257                              widget->allocation.height);                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2258      }                             priv->pixmap,
2259      else if (-priv->drag_mouse_dx > EXTRA_BORDER)                             0,0,
2260      {                             priv->drag_mouse_dx - EXTRA_BORDER,
2261          gdk_draw_rectangle (                             priv->drag_mouse_dy - EXTRA_BORDER,
2262                              widget->window,                             -1,-1);
2263                              widget->style->white_gc,  
2264                              TRUE,          //Paint white outside of the map if dragging. Its less
2265                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,          //ugly than painting the corrupted map
2266                              -priv->drag_mouse_dx - EXTRA_BORDER,          if(priv->drag_mouse_dx>EXTRA_BORDER) {
2267                              widget->allocation.height);              gdk_draw_rectangle (drawable,
2268      }                                  widget->style->white_gc,
2269                                    TRUE,
2270      if (priv->drag_mouse_dy>EXTRA_BORDER) {                                  0, 0,
2271          gdk_draw_rectangle (                                  priv->drag_mouse_dx - EXTRA_BORDER,
2272                              widget->window,                                  widget->allocation.height);
2273                              widget->style->white_gc,          }
2274                              TRUE,          else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2275                              0, 0,          {
2276                              widget->allocation.width,              gdk_draw_rectangle (drawable,
2277                              priv->drag_mouse_dy - EXTRA_BORDER);                                  widget->style->white_gc,
2278      }                                  TRUE,
2279      else if (-priv->drag_mouse_dy > EXTRA_BORDER)                                  priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2280      {                                  -priv->drag_mouse_dx - EXTRA_BORDER,
2281          gdk_draw_rectangle (                                  widget->allocation.height);
2282                              widget->window,          }
2283                              widget->style->white_gc,  
2284                              TRUE,          if (priv->drag_mouse_dy>EXTRA_BORDER) {
2285                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,              gdk_draw_rectangle (drawable,
2286                              widget->allocation.width,                                  widget->style->white_gc,
2287                              -priv->drag_mouse_dy - EXTRA_BORDER);                                  TRUE,
2288      }                                  0, 0,
2289  #if 0                                  widget->allocation.width,
2290      if(!priv->dragging)                                  priv->drag_mouse_dy - EXTRA_BORDER);
2291          gdk_draw_drawable (          }
2292                         widget->window,          else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2293            {
2294                gdk_draw_rectangle (drawable,
2295                                    widget->style->white_gc,
2296                                    TRUE,
2297                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2298                                    widget->allocation.width,
2299                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2300            }
2301        }
2302    
2303    #ifdef ENABLE_OSD
2304        /* draw new OSD */
2305        if(priv->osd)
2306            priv->osd->draw (priv->osd, drawable);
2307    
2308    #ifdef OSD_DOUBLE_BUFFER
2309        gdk_draw_drawable (widget->window,
2310                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2311                         priv->pixmap,                         priv->dbuf_pixmap,
2312                         event->area.x + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2313                         event->area.y + EXTRA_BORDER,  #endif
2314                         event->area.x, event->area.y,  
                        event->area.width, event->area.height);  
2315  #endif  #endif
2316    
2317      return FALSE;      return FALSE;
2318  }  }
2319    
# Line 2567  osm_gps_map_class_init (OsmGpsMapClass * Line 2395  osm_gps_map_class_init (OsmGpsMapClass *
2395                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2396    
2397      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,  
2398                                       PROP_ZOOM,                                       PROP_ZOOM,
2399                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2400                                                         "zoom",                                                         "zoom",
# Line 2692  osm_gps_map_class_init (OsmGpsMapClass * Line 2512  osm_gps_map_class_init (OsmGpsMapClass *
2512                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2513                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2514                                                         -1,                                                         -1,
2515                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2516    
2517      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2518                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2711  osm_gps_map_source_get_friendly_name(Osm Line 2531  osm_gps_map_source_get_friendly_name(Osm
2531          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2532              return "None";              return "None";
2533          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2534              return "OpenStreetMap";              return "OpenStreetMap I";
2535          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2536              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2537          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2538              return "OpenAerialMap";              return "OpenCycleMap";
2539            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2540                return "OSMC Trails";
2541          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2542              return "Maps-For-Free";              return "Maps-For-Free";
2543          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2757  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2579  osm_gps_map_source_get_repo_uri(OsmGpsMa
2579              return OSM_REPO_URI;              return OSM_REPO_URI;
2580          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2581              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2582          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2583              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";
2584            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2585                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2586          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2587              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";
2588          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2796  osm_gps_map_source_get_image_format(OsmG Line 2620  osm_gps_map_source_get_image_format(OsmG
2620          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2621          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2622          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2623            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2624            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2625              return "png";              return "png";
2626          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2627          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2628            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2629          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2630          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2631          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2806  osm_gps_map_source_get_image_format(OsmG Line 2633  osm_gps_map_source_get_image_format(OsmG
2633          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2634          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2635          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:  
2636              return "jpg";              return "jpg";
2637          default:          default:
2638              return "bin";              return "bin";
# Line 2829  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2654  osm_gps_map_source_get_max_zoom(OsmGpsMa
2654          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2655              return 18;              return 18;
2656          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2657            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2658              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2659          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2660          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2661          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2662          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2841  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2666  osm_gps_map_source_get_max_zoom(OsmGpsMa
2666          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2667          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2668              return 17;              return 17;
2669            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2670                return 15;
2671          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2672              return 11;              return 11;
2673          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2980  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2807  osm_gps_map_set_zoom (OsmGpsMap *map, in
2807          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2808                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2809    
2810    #ifdef ENABLE_OSD
2811            /* OSD may contain a scale, so we may have to re-render it */
2812            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2813                priv->osd->render (priv->osd);
2814    #endif
2815    
2816          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2817      }      }
2818      return priv->map_zoom;      return priv->map_zoom;
# Line 3065  osm_gps_map_clear_images (OsmGpsMap *map Line 2898  osm_gps_map_clear_images (OsmGpsMap *map
2898  }  }
2899    
2900  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  
2901  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)
2902  {  {
2903      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 3137  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2909  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2909      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2910      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2911      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2912        priv->gps_heading = deg2rad(heading);
2913    
2914      // pixel_x,y, offsets      // pixel_x,y, offsets
2915      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 3251  osm_gps_map_get_scale(OsmGpsMap *map) Line 3024  osm_gps_map_get_scale(OsmGpsMap *map)
3024  {  {
3025      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
3026    
3027      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);
3028      priv = map->priv;      priv = map->priv;
3029    
3030      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 3296  osm_gps_map_clear_balloon (OsmGpsMap *ma Line 3069  osm_gps_map_clear_balloon (OsmGpsMap *ma
3069  #endif  #endif
3070    
3071  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
3072  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdGpsCallback cb, gpointer data) {  
3073    void
3074    osm_gps_map_redraw (OsmGpsMap *map)
3075    {
3076        osm_gps_map_map_redraw_idle(map);
3077    }
3078    
3079    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
3080        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
3081        return map->priv->osd;
3082    }
3083    
3084    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
3085      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
3086    
3087      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
     priv = map->priv;  
3088    
3089      priv->osd.cb = cb;      priv = map->priv;
3090      priv->osd.data = data;      g_return_if_fail (!priv->osd);
3091    
3092      /* this may have changed the state of the gps button */      priv->osd = osd;
3093      /* we thus re-render the overlay */  }
     osm_gps_map_osd_render(priv);  
3094    
3095      osm_gps_map_map_redraw_idle(map);  void
3096    osm_gps_map_repaint (OsmGpsMap *map) {
3097        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3098  }  }
3099    
3100  #endif  #endif
Legend:
Removed from v.69  
changed lines
  Added in v.105