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 83 by harbaum, Thu Aug 27 20:24:31 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 1451  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1473  osm_gps_map_map_redraw (OsmGpsMap *map)
1473      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1474  #endif  #endif
1475    
 #ifdef ENABLE_OSD  
     if(priv->osd)  
         priv->osd->draw(priv->osd, EXTRA_BORDER, EXTRA_BORDER);  
 #endif  
   
1476      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1477      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1478      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
# Line 1472  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1489  osm_gps_map_map_redraw_idle (OsmGpsMap *
1489          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);
1490  }  }
1491    
1492    #ifdef OSM_GPS_MAP_KEYS
1493    static gboolean
1494    on_window_key_press(GtkWidget *widget,
1495                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1496      gboolean handled = FALSE;
1497      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1498    
1499      printf("key event with keyval %x\n", event->keyval);
1500    
1501      // the map handles some keys on its own ...
1502      switch(event->keyval) {
1503    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1504      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1505          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1506          if(!priv->fullscreen)
1507              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1508          else
1509              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1510    
1511          priv->fullscreen = !priv->fullscreen;
1512          handled = TRUE;
1513          } break;
1514    #endif
1515    
1516    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1517      case OSM_GPS_MAP_KEY_ZOOMIN:
1518          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1519          handled = TRUE;
1520          break;
1521    #endif
1522    
1523    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1524      case OSM_GPS_MAP_KEY_ZOOMOUT:
1525          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1526          handled = TRUE;
1527          break;
1528    #endif
1529    
1530    #ifdef OSM_GPS_MAP_KEY_UP
1531      case OSM_GPS_MAP_KEY_UP:
1532          priv->map_y -= step;
1533          priv->center_coord_set = FALSE;
1534          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1535          handled = TRUE;
1536          break;
1537    #endif
1538    
1539    #ifdef OSM_GPS_MAP_KEY_DOWN
1540      case OSM_GPS_MAP_KEY_DOWN:
1541          priv->map_y += step;
1542          priv->center_coord_set = FALSE;
1543          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1544          handled = TRUE;
1545          break;
1546    #endif
1547    
1548    #ifdef OSM_GPS_MAP_KEY_LEFT
1549      case OSM_GPS_MAP_KEY_LEFT:
1550          priv->map_x -= step;
1551          priv->center_coord_set = FALSE;
1552          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1553          handled = TRUE;
1554          break;
1555    #endif
1556    
1557    #ifdef OSM_GPS_MAP_KEY_RIGHT
1558      case OSM_GPS_MAP_KEY_RIGHT:
1559          priv->map_x += step;
1560          priv->center_coord_set = FALSE;
1561          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1562          handled = TRUE;
1563          break;
1564    #endif
1565    
1566      default:
1567          printf("unhandled key event with keyval %x\n", event->keyval);
1568          break;
1569      }
1570    
1571      return handled;
1572    }
1573    #endif
1574    
1575  static void  static void
1576  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1577  {  {
# Line 1496  osm_gps_map_init (OsmGpsMap *object) Line 1596  osm_gps_map_init (OsmGpsMap *object)
1596      priv->osd = NULL;      priv->osd = NULL;
1597  #endif  #endif
1598    
1599    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1600        priv->fullscreen = FALSE;
1601    #endif
1602    
1603      priv->tracks = NULL;      priv->tracks = NULL;
1604      priv->images = NULL;      priv->images = NULL;
1605    
# Line 1540  osm_gps_map_init (OsmGpsMap *object) Line 1644  osm_gps_map_init (OsmGpsMap *object)
1644      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1645    
1646      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);
 }  
1647    
1648  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1649  /* simple hash algorithm hack if md5 is not present */      //    GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(object));
1650  static char *simple_hash(char *str) {      g_signal_connect(G_OBJECT(object), "key_press_event",
1651      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);  
 }  
1652  #endif  #endif
1653    }
1654    
1655  static GObject *  static GObject *
1656  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 1689  osm_gps_map_constructor (GType gtype, gu
1689          }          }
1690      }      }
1691    
1692      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1693  #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);  
         }  
1694    
1695          g_free(md5);      if (priv->cache_dir) {
1696            char *old = priv->cache_dir;
1697            //the new cachedir is the given cache dir + the md5 of the repo_uri
1698            priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, fname);
1699            g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);
1700            g_free(old);
1701      }      }
1702    
1703      inspect_map_uri(map);      inspect_map_uri(map);
# Line 1662  osm_gps_map_dispose (GObject *object) Line 1746  osm_gps_map_dispose (GObject *object)
1746  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1747      if(priv->osd)      if(priv->osd)
1748          priv->osd->free(priv->osd);          priv->osd->free(priv->osd);
1749    
1750    #ifdef OSD_DOUBLE_BUFFER
1751        if(priv->dbuf_pixmap)
1752            g_object_unref (priv->dbuf_pixmap);
1753    #endif
1754  #endif  #endif
1755    
1756      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 1821  osm_gps_map_set_property (GObject *objec
1821              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1822                  priv->cache_dir = g_value_dup_string (value);                  priv->cache_dir = g_value_dup_string (value);
1823              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             priv->cache_dir_is_full_path = g_value_get_boolean (value);  
             break;  
1824          case PROP_ZOOM:          case PROP_ZOOM:
1825              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
1826              break;              break;
# Line 1804  osm_gps_map_get_property (GObject *objec Line 1890  osm_gps_map_get_property (GObject *objec
1890          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1891              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1892              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1893          case PROP_ZOOM:          case PROP_ZOOM:
1894              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1895              break;              break;
# Line 1891  osm_gps_map_button_press (GtkWidget *wid Line 1974  osm_gps_map_button_press (GtkWidget *wid
1974  #endif  #endif
1975    
1976  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
     #define SCROLL_STEP 10  
   
1977      /* pressed inside OSD control? */      /* pressed inside OSD control? */
1978      if(priv->osd) {      if(priv->osd) {
1979          osd_button_t but = priv->osd->check(event->x, event->y);          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
1980          if(but != OSD_NONE)          if(but != OSD_NONE)
1981          {          {
1982                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1983              priv->drag_counter = -1;              priv->drag_counter = -1;
1984    
1985              switch(but) {              switch(but) {
1986              case OSD_UP:              case OSD_UP:
1987                  priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  priv->map_y -= step;
1988                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
1989                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1990                  break;                  break;
1991    
1992              case OSD_DOWN:              case OSD_DOWN:
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_LEFT:              case OSD_LEFT:
1999                  priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  priv->map_x -= 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_RIGHT:              case OSD_RIGHT:
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_IN:              case OSD_IN:
# Line 1936  osm_gps_map_button_press (GtkWidget *wid Line 2022  osm_gps_map_button_press (GtkWidget *wid
2022                  break;                  break;
2023              }              }
2024    
             osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
2025              return FALSE;              return FALSE;
2026          }          }
2027      }      }
# Line 2023  osm_gps_map_motion_notify (GtkWidget *wi Line 2107  osm_gps_map_motion_notify (GtkWidget *wi
2107      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2108          return FALSE;          return FALSE;
2109    
2110  #ifdef USE_MAEMO  #ifdef OSM_GPS_MAP_REFRESH
2111      /* reduce update frequency on maemo to keep screen update fluid */      /* reduce update frequency on maemo to keep screen update fluid */
2112      static guint32 last_time = 0;      static guint32 last_time = 0;
2113    
2114      if(event->time - last_time < 100) return FALSE;      if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2115      last_time = event->time;      last_time = event->time;
2116  #endif  #endif
2117    
# Line 2039  osm_gps_map_motion_notify (GtkWidget *wi Line 2123  osm_gps_map_motion_notify (GtkWidget *wi
2123      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2124      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2125    
 #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  
   
2126      osm_gps_map_expose (widget, NULL);      osm_gps_map_expose (widget, NULL);
2127    
   
2128      return FALSE;      return FALSE;
2129  }  }
2130    
# Line 2067  osm_gps_map_configure (GtkWidget *widget Line 2138  osm_gps_map_configure (GtkWidget *widget
2138          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2139    
2140      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2141                                     widget->window,                          widget->window,
2142                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2143                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2144                                     -1);                          -1);
2145    
2146  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2147    
2148    #ifdef OSD_DOUBLE_BUFFER
2149        if (priv->dbuf_pixmap)
2150            g_object_unref (priv->dbuf_pixmap);
2151    
2152        priv->dbuf_pixmap = gdk_pixmap_new (
2153                            widget->window,
2154                            widget->allocation.width,
2155                            widget->allocation.height,
2156                            -1);
2157    #endif
2158    
2159      /* the osd needs some references to map internal objects */      /* the osd needs some references to map internal objects */
2160      if(priv->osd)      if(priv->osd)
     {  
         priv->osd->pixmap = priv->pixmap;  
2161          priv->osd->widget = widget;          priv->osd->widget = widget;
     }  
2162  #endif  #endif
2163    
2164      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
# Line 2097  osm_gps_map_expose (GtkWidget *widget, G Line 2177  osm_gps_map_expose (GtkWidget *widget, G
2177  {  {
2178      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2179    
2180      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2181                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2182                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  #else
2183                         priv->pixmap,      GdkDrawable *drawable = widget->window;
2184                         0,0,  #endif
2185                         priv->drag_mouse_dx - EXTRA_BORDER,  
2186                         priv->drag_mouse_dy - EXTRA_BORDER,      if (!priv->dragging)
2187                         -1,-1);      {
2188            gdk_draw_drawable (drawable,
2189      //Paint white outside of the map if dragging. Its less                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2190      //ugly than painting the corrupted map                             priv->pixmap,
2191      if(priv->drag_mouse_dx>EXTRA_BORDER) {                             event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2192          gdk_draw_rectangle (                             event->area.x, event->area.y,
2193                              widget->window,                             event->area.width, event->area.height);
2194                              widget->style->white_gc,      }
2195                              TRUE,      else
2196                              0, 0,      {
2197                              priv->drag_mouse_dx - EXTRA_BORDER,          gdk_draw_drawable (drawable,
2198                              widget->allocation.height);                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2199      }                             priv->pixmap,
2200      else if (-priv->drag_mouse_dx > EXTRA_BORDER)                             0,0,
2201      {                             priv->drag_mouse_dx - EXTRA_BORDER,
2202          gdk_draw_rectangle (                             priv->drag_mouse_dy - EXTRA_BORDER,
2203                              widget->window,                             -1,-1);
2204                              widget->style->white_gc,  
2205                              TRUE,          //Paint white outside of the map if dragging. Its less
2206                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,          //ugly than painting the corrupted map
2207                              -priv->drag_mouse_dx - EXTRA_BORDER,          if(priv->drag_mouse_dx>EXTRA_BORDER) {
2208                              widget->allocation.height);              gdk_draw_rectangle (drawable,
2209      }                                  widget->style->white_gc,
2210                                    TRUE,
2211      if (priv->drag_mouse_dy>EXTRA_BORDER) {                                  0, 0,
2212          gdk_draw_rectangle (                                  priv->drag_mouse_dx - EXTRA_BORDER,
2213                              widget->window,                                  widget->allocation.height);
2214                              widget->style->white_gc,          }
2215                              TRUE,          else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2216                              0, 0,          {
2217                              widget->allocation.width,              gdk_draw_rectangle (drawable,
2218                              priv->drag_mouse_dy - EXTRA_BORDER);                                  widget->style->white_gc,
2219      }                                  TRUE,
2220      else if (-priv->drag_mouse_dy > EXTRA_BORDER)                                  priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2221      {                                  -priv->drag_mouse_dx - EXTRA_BORDER,
2222          gdk_draw_rectangle (                                  widget->allocation.height);
2223                              widget->window,          }
2224                              widget->style->white_gc,  
2225                              TRUE,          if (priv->drag_mouse_dy>EXTRA_BORDER) {
2226                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,              gdk_draw_rectangle (drawable,
2227                              widget->allocation.width,                                  widget->style->white_gc,
2228                              -priv->drag_mouse_dy - EXTRA_BORDER);                                  TRUE,
2229      }                                  0, 0,
2230  #if 0                                  widget->allocation.width,
2231      if(!priv->dragging)                                  priv->drag_mouse_dy - EXTRA_BORDER);
2232          gdk_draw_drawable (          }
2233                         widget->window,          else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2234            {
2235                gdk_draw_rectangle (drawable,
2236                                    widget->style->white_gc,
2237                                    TRUE,
2238                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2239                                    widget->allocation.width,
2240                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2241            }
2242        }
2243    
2244    #ifdef ENABLE_OSD
2245        /* draw new OSD */
2246        if(priv->osd)
2247            priv->osd->draw (priv->osd, drawable);
2248    
2249    #ifdef OSD_DOUBLE_BUFFER
2250        gdk_draw_drawable (widget->window,
2251                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2252                         priv->pixmap,                         priv->dbuf_pixmap,
2253                         event->area.x + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2254                         event->area.y + EXTRA_BORDER,  #endif
2255                         event->area.x, event->area.y,  
                        event->area.width, event->area.height);  
2256  #endif  #endif
2257    
2258      return FALSE;      return FALSE;
2259  }  }
2260    
# Line 2239  osm_gps_map_class_init (OsmGpsMapClass * Line 2336  osm_gps_map_class_init (OsmGpsMapClass *
2336                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2337    
2338      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,  
2339                                       PROP_ZOOM,                                       PROP_ZOOM,
2340                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2341                                                         "zoom",                                                         "zoom",
# Line 2737  osm_gps_map_clear_images (OsmGpsMap *map Line 2826  osm_gps_map_clear_images (OsmGpsMap *map
2826  }  }
2827    
2828  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  
2829  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)
2830  {  {
2831      int pixel_x, pixel_y;      int pixel_x, pixel_y;
Legend:
Removed from v.73  
changed lines
  Added in v.83