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 87 by harbaum, Mon Aug 31 12:01:28 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  struct _OsmGpsMapPrivate  struct _OsmGpsMapPrivate
70  {  {
71      GHashTable *tile_queue;      GHashTable *tile_queue;
# Line 79  struct _OsmGpsMapPrivate Line 96  struct _OsmGpsMapPrivate
96    
97      //where downloaded tiles are cached      //where downloaded tiles are cached
98      char *cache_dir;      char *cache_dir;
     gboolean cache_dir_is_full_path;  
99    
100      //contains flags indicating the various special characters      //contains flags indicating the various special characters
101      //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 128  struct _OsmGpsMapPrivate
128  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
129      //the osd controls (if present)      //the osd controls (if present)
130      osm_gps_map_osd_t *osd;      osm_gps_map_osd_t *osd;
131    #ifdef OSD_DOUBLE_BUFFER
132        GdkPixmap *dbuf_pixmap;
133    #endif
134    #endif
135    
136    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
137        gboolean fullscreen;
138  #endif  #endif
139    
140      //additional images or tracks added to the map      //additional images or tracks added to the map
# Line 165  enum Line 188  enum
188      PROP_REPO_URI,      PROP_REPO_URI,
189      PROP_PROXY_URI,      PROP_PROXY_URI,
190      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
191      PROP_ZOOM,      PROP_ZOOM,
192      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
193      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 1424  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1446  osm_gps_map_map_redraw (OsmGpsMap *map)
1446    
1447      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1448    
1449        /* don't redraw the entire map while the OSD is doing */
1450        /* some animation or the like. This is to keep the animation */
1451        /* fluid */
1452        if (priv->osd->busy(priv->osd))
1453            return FALSE;
1454    
1455      /* 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
1456       * 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
1457       * 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 1479  osm_gps_map_map_redraw (OsmGpsMap *map)
1479      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1480  #endif  #endif
1481    
 #ifdef ENABLE_OSD  
     if(priv->osd)  
         priv->osd->draw(priv->osd, EXTRA_BORDER, EXTRA_BORDER);  
 #endif  
   
1482      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1483      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1484      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
# Line 1472  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1495  osm_gps_map_map_redraw_idle (OsmGpsMap *
1495          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);
1496  }  }
1497    
1498    #ifdef OSM_GPS_MAP_KEYS
1499    static gboolean
1500    on_window_key_press(GtkWidget *widget,
1501                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1502      gboolean handled = FALSE;
1503      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1504    
1505      //  printf("key event with keyval %x\n", event->keyval);
1506    
1507      // the map handles some keys on its own ...
1508      switch(event->keyval) {
1509    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1510      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1511          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1512          if(!priv->fullscreen)
1513              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1514          else
1515              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1516    
1517          priv->fullscreen = !priv->fullscreen;
1518          handled = TRUE;
1519          } break;
1520    #endif
1521    
1522    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1523      case OSM_GPS_MAP_KEY_ZOOMIN:
1524          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1525          handled = TRUE;
1526          break;
1527    #endif
1528    
1529    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1530      case OSM_GPS_MAP_KEY_ZOOMOUT:
1531          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1532          handled = TRUE;
1533          break;
1534    #endif
1535    
1536    #ifdef OSM_GPS_MAP_KEY_UP
1537      case OSM_GPS_MAP_KEY_UP:
1538          priv->map_y -= step;
1539          priv->center_coord_set = FALSE;
1540          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1541          handled = TRUE;
1542          break;
1543    #endif
1544    
1545    #ifdef OSM_GPS_MAP_KEY_DOWN
1546      case OSM_GPS_MAP_KEY_DOWN:
1547          priv->map_y += step;
1548          priv->center_coord_set = FALSE;
1549          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1550          handled = TRUE;
1551          break;
1552    #endif
1553    
1554    #ifdef OSM_GPS_MAP_KEY_LEFT
1555      case OSM_GPS_MAP_KEY_LEFT:
1556          priv->map_x -= step;
1557          priv->center_coord_set = FALSE;
1558          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1559          handled = TRUE;
1560          break;
1561    #endif
1562    
1563    #ifdef OSM_GPS_MAP_KEY_RIGHT
1564      case OSM_GPS_MAP_KEY_RIGHT:
1565          priv->map_x += step;
1566          priv->center_coord_set = FALSE;
1567          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1568          handled = TRUE;
1569          break;
1570    #endif
1571    
1572      default:
1573          //      printf("unhandled key event with keyval %x\n", event->keyval);
1574          break;
1575      }
1576    
1577      return handled;
1578    }
1579    #endif
1580    
1581  static void  static void
1582  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1583  {  {
# Line 1496  osm_gps_map_init (OsmGpsMap *object) Line 1602  osm_gps_map_init (OsmGpsMap *object)
1602      priv->osd = NULL;      priv->osd = NULL;
1603  #endif  #endif
1604    
1605    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1606        priv->fullscreen = FALSE;
1607    #endif
1608    
1609      priv->tracks = NULL;      priv->tracks = NULL;
1610      priv->images = NULL;      priv->images = NULL;
1611    
# Line 1540  osm_gps_map_init (OsmGpsMap *object) Line 1650  osm_gps_map_init (OsmGpsMap *object)
1650      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1651    
1652      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);
 }  
1653    
1654  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1655  /* simple hash algorithm hack if md5 is not present */      //    GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(object));
1656  static char *simple_hash(char *str) {      g_signal_connect(G_OBJECT(object), "key_press_event",
1657      union {                       G_CALLBACK(on_window_key_press), priv);
         char str[4];  
         gulong val;  
     } hash = { .val = 0x55555555 };  
   
     while(*str) {  
         hash.str[(int)str & 3] ^= *str;  
         str++;  
     }  
     return g_strdup_printf("%08lX", hash.val);  
 }  
1658  #endif  #endif
1659    }
1660    
1661  static GObject *  static GObject *
1662  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 1695  osm_gps_map_constructor (GType gtype, gu
1695          }          }
1696      }      }
1697    
1698      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1699  #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  
1700    
1701          if (priv->cache_dir) {      if (priv->cache_dir) {
1702              char *old = priv->cache_dir;          char *old = priv->cache_dir;
1703              //the new cachedir is the given cache dir + the md5 of the repo_uri          //the new cachedir is the given cache dir + the md5 of the repo_uri
1704              priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);          priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, fname);
1705              g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);          g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);
1706              g_free(old);          g_free(old);
         } else {  
             //the new cachedir is the current dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup(md5);  
         }  
   
         g_free(md5);  
1707      }      }
1708    
1709      inspect_map_uri(map);      inspect_map_uri(map);
# Line 1662  osm_gps_map_dispose (GObject *object) Line 1752  osm_gps_map_dispose (GObject *object)
1752  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1753      if(priv->osd)      if(priv->osd)
1754          priv->osd->free(priv->osd);          priv->osd->free(priv->osd);
1755    
1756    #ifdef OSD_DOUBLE_BUFFER
1757        if(priv->dbuf_pixmap)
1758            g_object_unref (priv->dbuf_pixmap);
1759    #endif
1760  #endif  #endif
1761    
1762      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
# Line 1732  osm_gps_map_set_property (GObject *objec Line 1827  osm_gps_map_set_property (GObject *objec
1827              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1828                  priv->cache_dir = g_value_dup_string (value);                  priv->cache_dir = g_value_dup_string (value);
1829              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             priv->cache_dir_is_full_path = g_value_get_boolean (value);  
             break;  
1830          case PROP_ZOOM:          case PROP_ZOOM:
1831              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
1832              break;              break;
# Line 1804  osm_gps_map_get_property (GObject *objec Line 1896  osm_gps_map_get_property (GObject *objec
1896          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1897              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1898              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1899          case PROP_ZOOM:          case PROP_ZOOM:
1900              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1901              break;              break;
# Line 1891  osm_gps_map_button_press (GtkWidget *wid Line 1980  osm_gps_map_button_press (GtkWidget *wid
1980  #endif  #endif
1981    
1982  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
     #define SCROLL_STEP 10  
   
1983      /* pressed inside OSD control? */      /* pressed inside OSD control? */
1984      if(priv->osd) {      if(priv->osd) {
1985          osd_button_t but = priv->osd->check(event->x, event->y);          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
1986          if(but != OSD_NONE)          if(but != OSD_NONE)
1987          {          {
1988                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1989              priv->drag_counter = -1;              priv->drag_counter = -1;
1990    
1991              switch(but) {              switch(but) {
1992              case OSD_UP:              case OSD_UP:
1993                  priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  priv->map_y -= step;
1994                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
1995                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1996                  break;                  break;
1997    
1998              case OSD_DOWN:              case OSD_DOWN:
1999                  priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  priv->map_y += step;
2000                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2001                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2002                  break;                  break;
2003    
2004              case OSD_LEFT:              case OSD_LEFT:
2005                  priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  priv->map_x -= step;
2006                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2007                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2008                  break;                  break;
2009    
2010              case OSD_RIGHT:              case OSD_RIGHT:
2011                  priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  priv->map_x += step;
2012                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2013                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2014                  break;                  break;
2015    
2016              case OSD_IN:              case OSD_IN:
# Line 1936  osm_gps_map_button_press (GtkWidget *wid Line 2028  osm_gps_map_button_press (GtkWidget *wid
2028                  break;                  break;
2029              }              }
2030    
             osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
2031              return FALSE;              return FALSE;
2032          }          }
2033      }      }
# Line 2023  osm_gps_map_motion_notify (GtkWidget *wi Line 2113  osm_gps_map_motion_notify (GtkWidget *wi
2113      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2114          return FALSE;          return FALSE;
2115    
2116  #ifdef USE_MAEMO  #ifdef OSM_GPS_MAP_REFRESH
2117      /* reduce update frequency on maemo to keep screen update fluid */      /* reduce update frequency on maemo to keep screen update fluid */
2118      static guint32 last_time = 0;      static guint32 last_time = 0;
2119    
2120      if(event->time - last_time < 100) return FALSE;      if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2121      last_time = event->time;      last_time = event->time;
2122  #endif  #endif
2123    
# Line 2039  osm_gps_map_motion_notify (GtkWidget *wi Line 2129  osm_gps_map_motion_notify (GtkWidget *wi
2129      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2130      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2131    
 #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  
   
2132      osm_gps_map_expose (widget, NULL);      osm_gps_map_expose (widget, NULL);
2133    
   
2134      return FALSE;      return FALSE;
2135  }  }
2136    
# Line 2067  osm_gps_map_configure (GtkWidget *widget Line 2144  osm_gps_map_configure (GtkWidget *widget
2144          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2145    
2146      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2147                                     widget->window,                          widget->window,
2148                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2149                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2150                                     -1);                          -1);
2151    
2152  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2153    
2154    #ifdef OSD_DOUBLE_BUFFER
2155        if (priv->dbuf_pixmap)
2156            g_object_unref (priv->dbuf_pixmap);
2157    
2158        priv->dbuf_pixmap = gdk_pixmap_new (
2159                            widget->window,
2160                            widget->allocation.width,
2161                            widget->allocation.height,
2162                            -1);
2163    #endif
2164    
2165      /* the osd needs some references to map internal objects */      /* the osd needs some references to map internal objects */
2166      if(priv->osd)      if(priv->osd)
     {  
         priv->osd->pixmap = priv->pixmap;  
2167          priv->osd->widget = widget;          priv->osd->widget = widget;
     }  
2168  #endif  #endif
2169    
2170      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
# Line 2097  osm_gps_map_expose (GtkWidget *widget, G Line 2183  osm_gps_map_expose (GtkWidget *widget, G
2183  {  {
2184      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2185    
2186      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2187                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2188                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  #else
2189                         priv->pixmap,      GdkDrawable *drawable = widget->window;
2190                         0,0,  #endif
2191                         priv->drag_mouse_dx - EXTRA_BORDER,  
2192                         priv->drag_mouse_dy - EXTRA_BORDER,      if (!priv->dragging && event)
2193                         -1,-1);      {
2194            gdk_draw_drawable (drawable,
2195      //Paint white outside of the map if dragging. Its less                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2196      //ugly than painting the corrupted map                             priv->pixmap,
2197      if(priv->drag_mouse_dx>EXTRA_BORDER) {                             event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2198          gdk_draw_rectangle (                             event->area.x, event->area.y,
2199                              widget->window,                             event->area.width, event->area.height);
2200                              widget->style->white_gc,      }
2201                              TRUE,      else
2202                              0, 0,      {
2203                              priv->drag_mouse_dx - EXTRA_BORDER,          gdk_draw_drawable (drawable,
2204                              widget->allocation.height);                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2205      }                             priv->pixmap,
2206      else if (-priv->drag_mouse_dx > EXTRA_BORDER)                             0,0,
2207      {                             priv->drag_mouse_dx - EXTRA_BORDER,
2208          gdk_draw_rectangle (                             priv->drag_mouse_dy - EXTRA_BORDER,
2209                              widget->window,                             -1,-1);
2210                              widget->style->white_gc,  
2211                              TRUE,          //Paint white outside of the map if dragging. Its less
2212                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,          //ugly than painting the corrupted map
2213                              -priv->drag_mouse_dx - EXTRA_BORDER,          if(priv->drag_mouse_dx>EXTRA_BORDER) {
2214                              widget->allocation.height);              gdk_draw_rectangle (drawable,
2215      }                                  widget->style->white_gc,
2216                                    TRUE,
2217      if (priv->drag_mouse_dy>EXTRA_BORDER) {                                  0, 0,
2218          gdk_draw_rectangle (                                  priv->drag_mouse_dx - EXTRA_BORDER,
2219                              widget->window,                                  widget->allocation.height);
2220                              widget->style->white_gc,          }
2221                              TRUE,          else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2222                              0, 0,          {
2223                              widget->allocation.width,              gdk_draw_rectangle (drawable,
2224                              priv->drag_mouse_dy - EXTRA_BORDER);                                  widget->style->white_gc,
2225      }                                  TRUE,
2226      else if (-priv->drag_mouse_dy > EXTRA_BORDER)                                  priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2227      {                                  -priv->drag_mouse_dx - EXTRA_BORDER,
2228          gdk_draw_rectangle (                                  widget->allocation.height);
2229                              widget->window,          }
2230                              widget->style->white_gc,  
2231                              TRUE,          if (priv->drag_mouse_dy>EXTRA_BORDER) {
2232                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,              gdk_draw_rectangle (drawable,
2233                              widget->allocation.width,                                  widget->style->white_gc,
2234                              -priv->drag_mouse_dy - EXTRA_BORDER);                                  TRUE,
2235      }                                  0, 0,
2236  #if 0                                  widget->allocation.width,
2237      if(!priv->dragging)                                  priv->drag_mouse_dy - EXTRA_BORDER);
2238          gdk_draw_drawable (          }
2239                         widget->window,          else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2240            {
2241                gdk_draw_rectangle (drawable,
2242                                    widget->style->white_gc,
2243                                    TRUE,
2244                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2245                                    widget->allocation.width,
2246                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2247            }
2248        }
2249    
2250    #ifdef ENABLE_OSD
2251        /* draw new OSD */
2252        if(priv->osd)
2253            priv->osd->draw (priv->osd, drawable);
2254    
2255    #ifdef OSD_DOUBLE_BUFFER
2256        gdk_draw_drawable (widget->window,
2257                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2258                         priv->pixmap,                         priv->dbuf_pixmap,
2259                         event->area.x + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2260                         event->area.y + EXTRA_BORDER,  #endif
2261                         event->area.x, event->area.y,  
                        event->area.width, event->area.height);  
2262  #endif  #endif
2263    
2264      return FALSE;      return FALSE;
2265  }  }
2266    
# Line 2239  osm_gps_map_class_init (OsmGpsMapClass * Line 2342  osm_gps_map_class_init (OsmGpsMapClass *
2342                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2343    
2344      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,  
2345                                       PROP_ZOOM,                                       PROP_ZOOM,
2346                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2347                                                         "zoom",                                                         "zoom",
# Line 2386  osm_gps_map_source_get_friendly_name(Osm Line 2481  osm_gps_map_source_get_friendly_name(Osm
2481              return "OpenStreetMap";              return "OpenStreetMap";
2482          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2483              return "OpenStreetMap Renderer";              return "OpenStreetMap Renderer";
2484          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2485              return "OpenAerialMap";              return "OpenCycleMap";
2486          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2487              return "Maps-For-Free";              return "Maps-For-Free";
2488          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 2524  osm_gps_map_source_get_repo_uri(OsmGpsMa
2524              return OSM_REPO_URI;              return OSM_REPO_URI;
2525          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2526              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2527          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2528              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";
2529          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2530              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";
2531          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 2563  osm_gps_map_source_get_image_format(OsmG
2563          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2564          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2565          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2566            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2567              return "png";              return "png";
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2568          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2569          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2570          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2503  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2598  osm_gps_map_source_get_max_zoom(OsmGpsMa
2598          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2599              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2600          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2601          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2602          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2603          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2604          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 2832  osm_gps_map_clear_images (OsmGpsMap *map
2832  }  }
2833    
2834  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  
2835  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)
2836  {  {
2837      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2991  void osm_gps_map_register_osd(OsmGpsMap Line 3025  void osm_gps_map_register_osd(OsmGpsMap
3025      priv->osd = osd;      priv->osd = osd;
3026  }  }
3027    
3028    void
3029    osm_gps_map_repaint (OsmGpsMap *map) {
3030        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3031    }
3032    
3033  #endif  #endif
Legend:
Removed from v.73  
changed lines
  Added in v.87