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

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

revision 112 by harbaum, Tue Sep 15 13:52:04 2009 UTC revision 136 by harbaum, Mon Oct 19 13:02:41 2009 UTC
# Line 66  typedef enum { Line 66  typedef enum {
66      OSM_GPS_MAP_SOURCE_OPENSTREETMAP,      OSM_GPS_MAP_SOURCE_OPENSTREETMAP,
67      OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER,      OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER,
68      OSM_GPS_MAP_SOURCE_OPENCYCLEMAP,      OSM_GPS_MAP_SOURCE_OPENCYCLEMAP,
     OSM_GPS_MAP_SOURCE_OSMC_TRAILS,  
69      OSM_GPS_MAP_SOURCE_GOOGLE_STREET,      OSM_GPS_MAP_SOURCE_GOOGLE_STREET,
     OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE,  
70      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET,      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET,
71      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE,      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE,
72      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID,      OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID,
73    
74      /* entries below are currently unusable */      /* entries below are currently unusable */
75        OSM_GPS_MAP_SOURCE_OSMC_TRAILS,      /* only germany       */
76      OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE,    /* not enough details */      OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE,    /* not enough details */
77      OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID,    /* disabled by google */      OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID,    /* disabled by google */
78        OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE, /* disabled by google */
79      OSM_GPS_MAP_SOURCE_YAHOO_STREET,     /* no implemented yet */      OSM_GPS_MAP_SOURCE_YAHOO_STREET,     /* no implemented yet */
80      OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE,  /* no implemented yet */      OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE,  /* no implemented yet */
81      OSM_GPS_MAP_SOURCE_YAHOO_HYBRID      /* no implemented yet */      OSM_GPS_MAP_SOURCE_YAHOO_HYBRID      /* no implemented yet */
# Line 111  typedef struct osm_gps_map_osd_s { Line 111  typedef struct osm_gps_map_osd_s {
111    
112      void(*render)(struct osm_gps_map_osd_s *);      void(*render)(struct osm_gps_map_osd_s *);
113      void(*draw)(struct osm_gps_map_osd_s *, GdkDrawable *);      void(*draw)(struct osm_gps_map_osd_s *, GdkDrawable *);
114      osd_button_t(*check)(struct osm_gps_map_osd_s *,gint, gint);       /* check if x/y lies within OSD */      osd_button_t(*check)(struct osm_gps_map_osd_s *,gboolean,gint, gint);       /* check if x/y lies within OSD */
115      gboolean(*busy)(struct osm_gps_map_osd_s *);      gboolean(*busy)(struct osm_gps_map_osd_s *);
116      void(*free)(struct osm_gps_map_osd_s *);      void(*free)(struct osm_gps_map_osd_s *);
117    
# Line 121  typedef struct osm_gps_map_osd_s { Line 121  typedef struct osm_gps_map_osd_s {
121      gpointer priv;      gpointer priv;
122  } osm_gps_map_osd_t;  } osm_gps_map_osd_t;
123    
124  typedef void (*OsmGpsMapBalloonCallback)(cairo_t *, OsmGpsMapRect_t *rect,  typedef enum {
125                                           gpointer data);      OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW,
126        OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK,
127        OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED,
128    } osm_gps_map_balloon_event_type_t;
129    
130    typedef struct {
131        osm_gps_map_balloon_event_type_t type;
132        union {
133            struct {
134                OsmGpsMapRect_t *rect;
135                cairo_t *cr;
136            } draw;
137    
138            struct {
139                int x, y;
140                gboolean down;
141            } click;
142        } data;
143    } osm_gps_map_balloon_event_t;
144    
145    typedef void (*OsmGpsMapBalloonCallback)(osm_gps_map_balloon_event_t *event, gpointer data);
146  #define OSM_GPS_MAP_BALLOON_CALLBACK(f) ((OsmGpsMapBalloonCallback) (f))  #define OSM_GPS_MAP_BALLOON_CALLBACK(f) ((OsmGpsMapBalloonCallback) (f))
147    
148  GType osm_gps_map_get_type (void) G_GNUC_CONST;  GType osm_gps_map_get_type (void) G_GNUC_CONST;
# Line 160  void osm_gps_map_register_osd(OsmGpsMap Line 180  void osm_gps_map_register_osd(OsmGpsMap
180  void osm_gps_map_redraw (OsmGpsMap *map);  void osm_gps_map_redraw (OsmGpsMap *map);
181  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);
182  void osm_gps_map_repaint (OsmGpsMap *map);  void osm_gps_map_repaint (OsmGpsMap *map);
183    coord_t *osm_gps_map_get_gps (OsmGpsMap *map);
184  #endif  #endif
185    
186    
Legend:
Removed from v.112  
changed lines
  Added in v.136