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

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

revision 60 by harbaum, Mon Aug 17 19:44:00 2009 UTC revision 85 by harbaum, Fri Aug 28 12:07:16 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 98  struct _OsmGpsMapPrivate Line 114  struct _OsmGpsMapPrivate
114      coord_t *gps;      coord_t *gps;
115      gboolean gps_valid;      gboolean gps_valid;
116    
117    #ifdef ENABLE_BALLOON
118      //a balloon with additional info      //a balloon with additional info
119      struct {      struct {
120          coord_t *coo;          coord_t *coo;
# Line 106  struct _OsmGpsMapPrivate Line 123  struct _OsmGpsMapPrivate
123          OsmGpsMapBalloonCallback cb;          OsmGpsMapBalloonCallback cb;
124          gpointer data;          gpointer data;
125      } balloon;      } balloon;
126    #endif
127    
128    #ifdef ENABLE_OSD
129        //the osd controls (if present)
130        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
139    
140      //additional images or tracks added to the map      //additional images or tracks added to the map
141      GSList *tracks;      GSList *tracks;
142      GSList *images;      GSList *images;
# Line 158  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 642  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 671  osm_gps_map_draw_gps_point (OsmGpsMap *m
671      }      }
672  }  }
673    
674    #ifdef ENABLE_BALLOON
675  /* most visual effects are hardcoded by now, but may be made */  /* most visual effects are hardcoded by now, but may be made */
676  /* available via properties later */  /* available via properties later */
677    #ifndef BALLOON_AREA_WIDTH
678  #define BALLOON_AREA_WIDTH           290  #define BALLOON_AREA_WIDTH           290
679    #endif
680    #ifndef BALLOON_AREA_HEIGHT
681  #define BALLOON_AREA_HEIGHT           75  #define BALLOON_AREA_HEIGHT           75
682    #endif
683    #ifndef BALLOON_CORNER_RADIUS
684    #define BALLOON_CORNER_RADIUS         10
685    #endif
686    
687  #define BALLOON_CORNER_RADIUS         20  #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
 #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/4)  
688  #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)  #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
689  #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)  #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
690  #define BALLOON_TRANSPARENCY         0.8  #define BALLOON_TRANSPARENCY         0.8
691  #define POINTER_HEIGHT                20  #define POINTER_HEIGHT                20
692  #define POINTER_FOOT_WIDTH            20  #define POINTER_FOOT_WIDTH            20
693  #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)  #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
694  #define BALLOON_SHADOW                5  #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
695  #define BALLOON_SHADOW_TRANSPARENCY  0.2  #define BALLOON_SHADOW_TRANSPARENCY  0.2
696    
697  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS/3)  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
698    
699    
700  /* draw the bubble shape. this is used twice, once for the shape and once */  /* draw the bubble shape. this is used twice, once for the shape and once */
# Line 668  osm_gps_map_draw_balloon_shape (cairo_t Line 704  osm_gps_map_draw_balloon_shape (cairo_t
704         gboolean bottom, int px, int py, int px0, int px1) {         gboolean bottom, int px, int py, int px0, int px1) {
705    
706      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
707      cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + BALLOON_CORNER_RADIUS, y0);      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
708                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
709      if(!bottom) {      if(!bottom) {
710          /* insert top pointer */          /* insert top pointer */
711          cairo_line_to (cr, px1, y0);          cairo_line_to (cr, px1, y0);
# Line 677  osm_gps_map_draw_balloon_shape (cairo_t Line 714  osm_gps_map_draw_balloon_shape (cairo_t
714      }      }
715    
716      cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);      cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
717      cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + BALLOON_CORNER_RADIUS);      cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
718                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
719      cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);      cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
720      cairo_curve_to (cr, x1, y1, x1, y1, x1 - BALLOON_CORNER_RADIUS, y1);      cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
721                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
722      if(bottom) {      if(bottom) {
723          /* insert bottom pointer */          /* insert bottom pointer */
724          cairo_line_to (cr, px0, y1);          cairo_line_to (cr, px0, y1);
# Line 688  osm_gps_map_draw_balloon_shape (cairo_t Line 727  osm_gps_map_draw_balloon_shape (cairo_t
727      }      }
728    
729      cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);      cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
730      cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - BALLOON_CORNER_RADIUS);      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
731                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
732    
733      cairo_close_path (cr);      cairo_close_path (cr);
734  }  }
735    
 /* http://cairographics.org/samples/ */  
736  static void  static void
737  osm_gps_map_draw_balloon_int (OsmGpsMap *map)  osm_gps_map_draw_balloon_int (OsmGpsMap *map)
738  {  {
# Line 780  osm_gps_map_draw_balloon_int (OsmGpsMap Line 819  osm_gps_map_draw_balloon_int (OsmGpsMap
819          cairo_stroke(cr);          cairo_stroke(cr);
820    
821          cairo_set_source_rgba (cr, 1, 1, 1, 1.0);          cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
822          cairo_set_line_width (cr, 3);          cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);
823          cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);          cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
824          cairo_move_to (cr, cx - crad/2, cy - crad/2);          cairo_move_to (cr, cx - crad/2, cy - crad/2);
825          cairo_line_to (cr, cx + crad/2, cy + crad/2);          cairo_line_to (cr, cx + crad/2, cy + crad/2);
# Line 801  osm_gps_map_draw_balloon_int (OsmGpsMap Line 840  osm_gps_map_draw_balloon_int (OsmGpsMap
840              priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);              priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
841          }          }
842    
843            cairo_destroy(cr);
844    
845          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
846                                      x0, y0, BALLOON_WIDTH,                                      x0, y0, BALLOON_WIDTH,
847                                      BALLOON_HEIGHT + POINTER_HEIGHT);                                      BALLOON_HEIGHT + POINTER_HEIGHT);
# Line 840  osm_gps_map_in_balloon(OsmGpsMapPrivate Line 881  osm_gps_map_in_balloon(OsmGpsMapPrivate
881              (y > priv->balloon.rect.y) &&              (y > priv->balloon.rect.y) &&
882              (y < priv->balloon.rect.y + priv->balloon.rect.h));              (y < priv->balloon.rect.y + priv->balloon.rect.h));
883  }  }
884    #endif // ENABLE_BALLOON
885    
886  static void  static void
887  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
# Line 903  osm_gps_map_tile_download_complete (Soup Line 945  osm_gps_map_tile_download_complete (Soup
945              }              }
946              else              else
947              {              {
948                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
949                              dl->folder);
950                    perror("perror:");
951              }              }
952          }          }
953    
# Line 1425  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1469  osm_gps_map_map_redraw (OsmGpsMap *map)
1469      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1470      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1471      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1472    #ifdef ENABLE_BALLOON
1473      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1474    #endif
1475    
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);
# Line 1443  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 1457  osm_gps_map_init (OsmGpsMap *object) Line 1586  osm_gps_map_init (OsmGpsMap *object)
1586      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1587      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1588    
1589    #ifdef ENABLE_BALLOON
1590      priv->balloon.coo = g_new0(coord_t, 1);      priv->balloon.coo = g_new0(coord_t, 1);
1591      priv->balloon.valid = FALSE;      priv->balloon.valid = FALSE;
1592      priv->balloon.cb = NULL;      priv->balloon.cb = NULL;
1593    #endif
1594    
1595    #ifdef ENABLE_OSD
1596        priv->osd = NULL;
1597    #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;
# Line 1505  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 1560  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 1619  osm_gps_map_dispose (GObject *object) Line 1738  osm_gps_map_dispose (GObject *object)
1738          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1739    
1740      g_free(priv->gps);      g_free(priv->gps);
1741    
1742    #ifdef ENABLE_BALLOON
1743      g_free(priv->balloon.coo);      g_free(priv->balloon.coo);
1744    #endif
1745    
1746    #ifdef ENABLE_OSD
1747        if(priv->osd)
1748            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
1755    
1756      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1757  }  }
# Line 1689  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 1761  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 1836  osm_gps_map_button_press (GtkWidget *wid Line 1962  osm_gps_map_button_press (GtkWidget *wid
1962  {  {
1963      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1964    
1965    #ifdef ENABLE_BALLOON
1966      /* don't drag if the user clicked within the balloon */      /* don't drag if the user clicked within the balloon */
1967      if (osm_gps_map_in_balloon(priv,      if (osm_gps_map_in_balloon(priv,
1968                     event->x + EXTRA_BORDER,                     event->x + EXTRA_BORDER,
# Line 1844  osm_gps_map_button_press (GtkWidget *wid Line 1971  osm_gps_map_button_press (GtkWidget *wid
1971          priv->drag_counter = -1;          priv->drag_counter = -1;
1972          return FALSE;          return FALSE;
1973      }      }
1974    #endif
1975    
1976    #ifdef ENABLE_OSD
1977        /* pressed inside OSD control? */
1978        if(priv->osd) {
1979            osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
1980            if(but != OSD_NONE)
1981            {
1982                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1983                priv->drag_counter = -1;
1984    
1985                switch(but) {
1986                case OSD_UP:
1987                    priv->map_y -= step;
1988                    priv->center_coord_set = FALSE;
1989                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1990                    break;
1991    
1992                case OSD_DOWN:
1993                    priv->map_y += step;
1994                    priv->center_coord_set = FALSE;
1995                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1996                    break;
1997    
1998                case OSD_LEFT:
1999                    priv->map_x -= step;
2000                    priv->center_coord_set = FALSE;
2001                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2002                    break;
2003    
2004                case OSD_RIGHT:
2005                    priv->map_x += step;
2006                    priv->center_coord_set = FALSE;
2007                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2008                    break;
2009    
2010                case OSD_IN:
2011                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
2012                    break;
2013    
2014                case OSD_OUT:
2015                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
2016                    break;
2017    
2018                default:
2019                    /* all custom buttons are forwarded to the application */
2020                    if(priv->osd->cb)
2021                        priv->osd->cb(but, priv->osd->data);
2022                    break;
2023                }
2024    
2025                return FALSE;
2026            }
2027        }
2028    #endif
2029    
2030      priv->drag_counter = 0;      priv->drag_counter = 0;
2031      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
# Line 1859  osm_gps_map_button_release (GtkWidget *w Line 2041  osm_gps_map_button_release (GtkWidget *w
2041  {  {
2042      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2043    
2044    #ifdef ENABLE_BALLOON
2045      /* released inside the balloon? */      /* released inside the balloon? */
2046      if (osm_gps_map_in_balloon(priv,      if (osm_gps_map_in_balloon(priv,
2047                     event->x + EXTRA_BORDER,                     event->x + EXTRA_BORDER,
# Line 1867  osm_gps_map_button_release (GtkWidget *w Line 2050  osm_gps_map_button_release (GtkWidget *w
2050          osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),          osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),
2051               event->x - priv->balloon.rect.x + EXTRA_BORDER,               event->x - priv->balloon.rect.x + EXTRA_BORDER,
2052               event->y - priv->balloon.rect.y + EXTRA_BORDER);               event->y - priv->balloon.rect.y + EXTRA_BORDER);
         return FALSE;  
2053      }      }
2054    #endif
     if (priv->drag_counter < 0)  
         return FALSE;  
2055    
2056      if (priv->dragging)      if (priv->dragging)
2057      {      {
# Line 1896  osm_gps_map_button_release (GtkWidget *w Line 2076  osm_gps_map_button_release (GtkWidget *w
2076  }  }
2077    
2078  static gboolean  static gboolean
2079    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
2080    
2081    static gboolean
2082  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
2083  {  {
2084      int x, y;      int x, y;
# Line 1924  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 OSM_GPS_MAP_REFRESH
2111        /* reduce update frequency on maemo to keep screen update fluid */
2112        static guint32 last_time = 0;
2113    
2114        if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2115        last_time = event->time;
2116    #endif
2117    
2118      priv->dragging = TRUE;      priv->dragging = TRUE;
2119    
2120      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1932  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    
2126      gdk_draw_drawable (      osm_gps_map_expose (widget, NULL);
                        widget->window,  
                        widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  
                        priv->pixmap,  
                        0,0,  
                        priv->drag_mouse_dx - EXTRA_BORDER, priv->drag_mouse_dy - EXTRA_BORDER,  
                        -1,-1);  
   
     //Paint white outside of the map if dragging. Its less  
     //ugly than painting the corrupted map  
     if(priv->drag_mouse_dx>EXTRA_BORDER) {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             0, 0,  
                             priv->drag_mouse_dx - EXTRA_BORDER,  
                             widget->allocation.height);  
     }  
     else if (-priv->drag_mouse_dx > EXTRA_BORDER)  
     {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,  
                             -priv->drag_mouse_dx - EXTRA_BORDER,  
                             widget->allocation.height);  
     }  
   
     if (priv->drag_mouse_dy>EXTRA_BORDER) {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             0, 0,  
                             widget->allocation.width,  
                             priv->drag_mouse_dy - EXTRA_BORDER);  
     }  
     else if (-priv->drag_mouse_dy > EXTRA_BORDER)  
     {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,  
                             widget->allocation.width,  
                             -priv->drag_mouse_dy - EXTRA_BORDER);  
     }  
2127    
2128      return FALSE;      return FALSE;
2129  }  }
# Line 1995  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
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 */
2160        if(priv->osd)
2161            priv->osd->widget = widget;
2162    #endif
2163    
2164      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2165      if(priv->gc_map)      if(priv->gc_map)
# Line 2016  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    #else
2183        GdkDrawable *drawable = widget->window;
2184    #endif
2185    
2186        if (!priv->dragging)
2187        {
2188            gdk_draw_drawable (drawable,
2189                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2190                               priv->pixmap,
2191                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2192                               event->area.x, event->area.y,
2193                               event->area.width, event->area.height);
2194        }
2195        else
2196        {
2197            gdk_draw_drawable (drawable,
2198                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2199                               priv->pixmap,
2200                               0,0,
2201                               priv->drag_mouse_dx - EXTRA_BORDER,
2202                               priv->drag_mouse_dy - EXTRA_BORDER,
2203                               -1,-1);
2204    
2205            //Paint white outside of the map if dragging. Its less
2206            //ugly than painting the corrupted map
2207            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2208                gdk_draw_rectangle (drawable,
2209                                    widget->style->white_gc,
2210                                    TRUE,
2211                                    0, 0,
2212                                    priv->drag_mouse_dx - EXTRA_BORDER,
2213                                    widget->allocation.height);
2214            }
2215            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2216            {
2217                gdk_draw_rectangle (drawable,
2218                                    widget->style->white_gc,
2219                                    TRUE,
2220                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2221                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2222                                    widget->allocation.height);
2223            }
2224    
2225            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2226                gdk_draw_rectangle (drawable,
2227                                    widget->style->white_gc,
2228                                    TRUE,
2229                                    0, 0,
2230                                    widget->allocation.width,
2231                                    priv->drag_mouse_dy - EXTRA_BORDER);
2232            }
2233            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
                        event->area.x, event->area.y,  
                        event->area.width, event->area.height);  
2255    
2256    #endif
2257    
2258      return FALSE;      return FALSE;
2259  }  }
2260    
# Line 2106  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 2210  osm_gps_map_class_init (OsmGpsMapClass * Line 2432  osm_gps_map_class_init (OsmGpsMapClass *
2432                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2433                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2434                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2435                                                         5,                                                         10,
2436                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2437    
2438      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 2253  osm_gps_map_source_get_friendly_name(Osm Line 2475  osm_gps_map_source_get_friendly_name(Osm
2475              return "OpenStreetMap";              return "OpenStreetMap";
2476          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2477              return "OpenStreetMap Renderer";              return "OpenStreetMap Renderer";
2478          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2479              return "OpenAerialMap";              return "OpenCycleMap";
2480          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2481              return "Maps-For-Free";              return "Maps-For-Free";
2482          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2296  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2518  osm_gps_map_source_get_repo_uri(OsmGpsMa
2518              return OSM_REPO_URI;              return OSM_REPO_URI;
2519          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2520              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2521          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2522              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";
2523          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2524              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";
2525          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2335  osm_gps_map_source_get_image_format(OsmG Line 2557  osm_gps_map_source_get_image_format(OsmG
2557          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2558          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2559          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2560            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2561              return "png";              return "png";
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2562          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2563          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2564          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2370  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2592  osm_gps_map_source_get_max_zoom(OsmGpsMa
2592          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2593              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2594          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2595          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2596          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2597          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2598          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2604  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;
# Line 2796  osm_gps_map_get_scale(OsmGpsMap *map) Line 2957  osm_gps_map_get_scale(OsmGpsMap *map)
2957      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
2958  }  }
2959    
2960    #ifdef ENABLE_BALLOON
2961  void  void
2962  osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
2963                            OsmGpsMapBalloonCallback cb, gpointer data)                            OsmGpsMapBalloonCallback cb, gpointer data)
# Line 2831  osm_gps_map_clear_balloon (OsmGpsMap *ma Line 2993  osm_gps_map_clear_balloon (OsmGpsMap *ma
2993    
2994      osm_gps_map_map_redraw_idle(map);      osm_gps_map_map_redraw_idle(map);
2995  }  }
2996    #endif
2997    
2998    #ifdef ENABLE_OSD
2999    
3000    void
3001    osm_gps_map_redraw (OsmGpsMap *map)
3002    {
3003        osm_gps_map_map_redraw_idle(map);
3004    }
3005    
3006    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
3007        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
3008        return map->priv->osd;
3009    }
3010    
3011    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
3012        OsmGpsMapPrivate *priv;
3013    
3014        g_return_if_fail (OSM_IS_GPS_MAP (map));
3015    
3016        priv = map->priv;
3017        g_return_if_fail (!priv->osd);
3018    
3019        priv->osd = osd;
3020    }
3021    
3022    #endif
Legend:
Removed from v.60  
changed lines
  Added in v.85