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

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

revision 73 by harbaum, Sun Aug 23 19:38:15 2009 UTC revision 89 by harbaum, Tue Sep 1 11:16:30 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 112  struct _OsmGpsMapPrivate Line 131  struct _OsmGpsMapPrivate
131  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
132      //the osd controls (if present)      //the osd controls (if present)
133      osm_gps_map_osd_t *osd;      osm_gps_map_osd_t *osd;
134    #ifdef OSD_DOUBLE_BUFFER
135        GdkPixmap *dbuf_pixmap;
136    #endif
137    #endif
138    
139    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
140        gboolean fullscreen;
141  #endif  #endif
142    
143      //additional images or tracks added to the map      //additional images or tracks added to the map
# Line 165  enum Line 191  enum
191      PROP_REPO_URI,      PROP_REPO_URI,
192      PROP_PROXY_URI,      PROP_PROXY_URI,
193      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
194      PROP_ZOOM,      PROP_ZOOM,
195      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
196      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 326  static void Line 351  static void
351  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
352  {  {
353      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
354        priv->uri_format = 0;
355        priv->the_google = FALSE;
356    
357      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
358          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 1072  osm_gps_map_download_tile (OsmGpsMap *ma Line 1099  osm_gps_map_download_tile (OsmGpsMap *ma
1099                  }                  }
1100              }              }
1101    
1102    #ifdef LIBSOUP22
1103                soup_message_headers_append(msg->request_headers,
1104                                            "User-Agent", USER_AGENT);
1105    #endif
1106    
1107              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
1108              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);
1109          } else {          } else {
# Line 1424  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1456  osm_gps_map_map_redraw (OsmGpsMap *map)
1456    
1457      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1458    
1459        /* don't redraw the entire map while the OSD is doing */
1460        /* some animation or the like. This is to keep the animation */
1461        /* fluid */
1462        if (priv->osd->busy(priv->osd))
1463            return FALSE;
1464    
1465      /* 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
1466       * 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
1467       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1451  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1489  osm_gps_map_map_redraw (OsmGpsMap *map)
1489      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1490  #endif  #endif
1491    
 #ifdef ENABLE_OSD  
     if(priv->osd)  
         priv->osd->draw(priv->osd, EXTRA_BORDER, EXTRA_BORDER);  
 #endif  
   
1492      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1493      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1494      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
# Line 1472  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1505  osm_gps_map_map_redraw_idle (OsmGpsMap *
1505          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);
1506  }  }
1507    
1508    #ifdef OSM_GPS_MAP_KEYS
1509    static gboolean
1510    on_window_key_press(GtkWidget *widget,
1511                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1512      gboolean handled = FALSE;
1513      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1514    
1515      // the map handles some keys on its own ...
1516      switch(event->keyval) {
1517    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1518      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1519          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1520          if(!priv->fullscreen)
1521              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1522          else
1523              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1524    
1525          priv->fullscreen = !priv->fullscreen;
1526          handled = TRUE;
1527          } break;
1528    #endif
1529    
1530    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1531      case OSM_GPS_MAP_KEY_ZOOMIN:
1532          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1533          handled = TRUE;
1534          break;
1535    #endif
1536    
1537    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1538      case OSM_GPS_MAP_KEY_ZOOMOUT:
1539          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1540          handled = TRUE;
1541          break;
1542    #endif
1543    
1544    #ifdef OSM_GPS_MAP_KEY_UP
1545      case OSM_GPS_MAP_KEY_UP:
1546          priv->map_y -= step;
1547          priv->center_coord_set = FALSE;
1548          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1549          handled = TRUE;
1550          break;
1551    #endif
1552    
1553    #ifdef OSM_GPS_MAP_KEY_DOWN
1554      case OSM_GPS_MAP_KEY_DOWN:
1555          priv->map_y += step;
1556          priv->center_coord_set = FALSE;
1557          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1558          handled = TRUE;
1559          break;
1560    #endif
1561    
1562    #ifdef OSM_GPS_MAP_KEY_LEFT
1563      case OSM_GPS_MAP_KEY_LEFT:
1564          priv->map_x -= step;
1565          priv->center_coord_set = FALSE;
1566          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1567          handled = TRUE;
1568          break;
1569    #endif
1570    
1571    #ifdef OSM_GPS_MAP_KEY_RIGHT
1572      case OSM_GPS_MAP_KEY_RIGHT:
1573          priv->map_x += step;
1574          priv->center_coord_set = FALSE;
1575          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1576          handled = TRUE;
1577          break;
1578    #endif
1579    
1580      default:
1581          break;
1582      }
1583    
1584      return handled;
1585    }
1586    #endif
1587    
1588  static void  static void
1589  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1590  {  {
# Line 1496  osm_gps_map_init (OsmGpsMap *object) Line 1609  osm_gps_map_init (OsmGpsMap *object)
1609      priv->osd = NULL;      priv->osd = NULL;
1610  #endif  #endif
1611    
1612    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1613        priv->fullscreen = FALSE;
1614    #endif
1615    
1616      priv->tracks = NULL;      priv->tracks = NULL;
1617      priv->images = NULL;      priv->images = NULL;
1618    
# Line 1512  osm_gps_map_init (OsmGpsMap *object) Line 1629  osm_gps_map_init (OsmGpsMap *object)
1629    
1630  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1631      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1632      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1633                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1634                                                               "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);  
1635  #else  #else
1636      /* 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 */
1637        /* set it seperately as an extra header field for each reuest */
1638      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1639  #endif  #endif
1640    
# Line 1540  osm_gps_map_init (OsmGpsMap *object) Line 1657  osm_gps_map_init (OsmGpsMap *object)
1657      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1658    
1659      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);
 }  
1660    
1661  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1662  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1663  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);  
 }  
1664  #endif  #endif
1665    }
1666    
1667  static GObject *  static GObject *
1668  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
# Line 1595  osm_gps_map_constructor (GType gtype, gu Line 1701  osm_gps_map_constructor (GType gtype, gu
1701          }          }
1702      }      }
1703    
1704      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1705  #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);  
         }  
1706    
1707          g_free(md5);      if (priv->tile_dir) {
1708            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1709            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1710            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1711      }      }
1712    
1713      inspect_map_uri(map);      inspect_map_uri(map);
# Line 1662  osm_gps_map_dispose (GObject *object) Line 1756  osm_gps_map_dispose (GObject *object)
1756  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1757      if(priv->osd)      if(priv->osd)
1758          priv->osd->free(priv->osd);          priv->osd->free(priv->osd);
1759    
1760    #ifdef OSD_DOUBLE_BUFFER
1761        if(priv->dbuf_pixmap)
1762            g_object_unref (priv->dbuf_pixmap);
1763    #endif
1764  #endif  #endif
1765    
1766      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
# Line 1673  osm_gps_map_finalize (GObject *object) Line 1772  osm_gps_map_finalize (GObject *object)
1772      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1773      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1774    
1775      g_free(priv->cache_dir);      if(priv->tile_dir)
1776            g_free(priv->tile_dir);
1777    
1778        if(priv->cache_dir)
1779            g_free(priv->cache_dir);
1780    
1781      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1782      g_free(priv->image_format);      g_free(priv->image_format);
1783    
# Line 1730  osm_gps_map_set_property (GObject *objec Line 1834  osm_gps_map_set_property (GObject *objec
1834              break;              break;
1835          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1836              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1837                  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);  
1838              break;              break;
1839          case PROP_ZOOM:          case PROP_ZOOM:
1840              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1761  osm_gps_map_set_property (GObject *objec Line 1862  osm_gps_map_set_property (GObject *objec
1862          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1863              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1864              break;              break;
1865          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1866                gint old = priv->map_source;
1867              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1868              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1869                   priv->map_source != old &&
1870                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1871                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1872    
1873                    /* we now have to switch the entire map */
1874    
1875                    /* flush the ram cache */
1876                    g_hash_table_remove_all(priv->tile_cache);
1877    
1878                    //check if the source given is valid
1879                    const char *uri = osm_gps_map_source_get_repo_uri(priv->map_source);
1880                    if (uri) {
1881                        g_debug("Setting map source from ID");
1882                        g_free(priv->repo_uri);
1883    
1884                        priv->repo_uri = g_strdup(uri);
1885                        priv->image_format = g_strdup(
1886                               osm_gps_map_source_get_image_format(priv->map_source));
1887                        priv->max_zoom = osm_gps_map_source_get_max_zoom(priv->map_source);
1888                        priv->min_zoom = osm_gps_map_source_get_min_zoom(priv->map_source);
1889                    }
1890    
1891                    /* create a new disk cache path */
1892                    const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1893                    if(!fname) fname = "_unknown_";
1894    
1895                    if (priv->tile_dir) {
1896                        //the new cachedir is the given cache dir + the friendly name of the repo_uri
1897                        priv->cache_dir =
1898                            g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1899                        g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1900                    }
1901    
1902                    /* adjust zoom if necessary */
1903                    if(priv->map_zoom > priv->max_zoom)
1904                        osm_gps_map_set_zoom(map, priv->max_zoom);
1905    
1906                    if(priv->map_zoom < priv->min_zoom)
1907                        osm_gps_map_set_zoom(map, priv->min_zoom);
1908    
1909                    inspect_map_uri(map);
1910    
1911                } } break;
1912          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1913              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1914              break;              break;
# Line 1804  osm_gps_map_get_property (GObject *objec Line 1949  osm_gps_map_get_property (GObject *objec
1949          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1950              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1951              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1952          case PROP_ZOOM:          case PROP_ZOOM:
1953              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1954              break;              break;
# Line 1891  osm_gps_map_button_press (GtkWidget *wid Line 2033  osm_gps_map_button_press (GtkWidget *wid
2033  #endif  #endif
2034    
2035  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
     #define SCROLL_STEP 10  
   
2036      /* pressed inside OSD control? */      /* pressed inside OSD control? */
2037      if(priv->osd) {      if(priv->osd) {
2038          osd_button_t but = priv->osd->check(event->x, event->y);          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
2039          if(but != OSD_NONE)          if(but != OSD_NONE)
2040          {          {
2041                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
2042              priv->drag_counter = -1;              priv->drag_counter = -1;
2043    
2044              switch(but) {              switch(but) {
2045              case OSD_UP:              case OSD_UP:
2046                  priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  priv->map_y -= step;
2047                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2048                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2049                  break;                  break;
2050    
2051              case OSD_DOWN:              case OSD_DOWN:
2052                  priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  priv->map_y += step;
2053                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2054                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2055                  break;                  break;
2056    
2057              case OSD_LEFT:              case OSD_LEFT:
2058                  priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  priv->map_x -= step;
2059                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2060                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2061                  break;                  break;
2062    
2063              case OSD_RIGHT:              case OSD_RIGHT:
2064                  priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  priv->map_x += step;
2065                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2066                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2067                  break;                  break;
2068    
2069              case OSD_IN:              case OSD_IN:
# Line 1936  osm_gps_map_button_press (GtkWidget *wid Line 2081  osm_gps_map_button_press (GtkWidget *wid
2081                  break;                  break;
2082              }              }
2083    
             osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
2084              return FALSE;              return FALSE;
2085          }          }
2086      }      }
# Line 2023  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 2039  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  
     if(priv->osd) {  
         /* undo OSD */  
         priv->osd->restore (priv->osd);  
   
         /* draw new OSD */  
         priv->osd->draw (priv->osd,  
                          EXTRA_BORDER - priv->drag_mouse_dx,  
                          EXTRA_BORDER - 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 2067  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  #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 */      /* the osd needs some references to map internal objects */
2219      if(priv->osd)      if(priv->osd)
     {  
         priv->osd->pixmap = priv->pixmap;  
2220          priv->osd->widget = widget;          priv->osd->widget = widget;
     }  
2221  #endif  #endif
2222    
2223      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
# Line 2097  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 2239  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 2364  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 2385  osm_gps_map_source_get_friendly_name(Osm Line 2533  osm_gps_map_source_get_friendly_name(Osm
2533          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2534              return "OpenStreetMap";              return "OpenStreetMap";
2535          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2536              return "OpenStreetMap Renderer";              return "OpenStreetMap Tiles@Home";
2537          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2538              return "OpenAerialMap";              return "OpenCycleMap";
2539          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2540              return "Maps-For-Free";              return "Maps-For-Free";
2541          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2429  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2577  osm_gps_map_source_get_repo_uri(OsmGpsMa
2577              return OSM_REPO_URI;              return OSM_REPO_URI;
2578          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2579              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2580          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2581              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";
2582          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2583              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";
2584          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2468  osm_gps_map_source_get_image_format(OsmG Line 2616  osm_gps_map_source_get_image_format(OsmG
2616          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2617          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2618          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2619            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2620              return "png";              return "png";
2621          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2622          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2623            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2624          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2625          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2626          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2478  osm_gps_map_source_get_image_format(OsmG Line 2628  osm_gps_map_source_get_image_format(OsmG
2628          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2629          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2630          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:  
2631              return "jpg";              return "jpg";
2632          default:          default:
2633              return "bin";              return "bin";
# Line 2503  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2651  osm_gps_map_source_get_max_zoom(OsmGpsMa
2651          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2652              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2653          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2654          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2655          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2656          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2657          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2737  osm_gps_map_clear_images (OsmGpsMap *map Line 2885  osm_gps_map_clear_images (OsmGpsMap *map
2885  }  }
2886    
2887  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  
2888  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)
2889  {  {
2890      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2991  void osm_gps_map_register_osd(OsmGpsMap Line 3078  void osm_gps_map_register_osd(OsmGpsMap
3078      priv->osd = osd;      priv->osd = osd;
3079  }  }
3080    
3081    void
3082    osm_gps_map_repaint (OsmGpsMap *map) {
3083        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3084    }
3085    
3086  #endif  #endif
Legend:
Removed from v.73  
changed lines
  Added in v.89