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

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

revision 72 by harbaum, Thu Aug 20 18:54:06 2009 UTC revision 73 by harbaum, Sun Aug 23 19:38:15 2009 UTC
# Line 91  typedef enum { Line 91  typedef enum {
91      OSD_RIGHT,      OSD_RIGHT,
92      OSD_IN,      OSD_IN,
93      OSD_OUT,      OSD_OUT,
94      OSD_GPS      OSD_CUSTOM   // first custom buttom
95  } osd_button_t;  } osd_button_t;
96    
97    typedef void (*OsmGpsMapOsdCallback)(osd_button_t but, gpointer data);
98    #define OSM_GPS_MAP_OSD_CALLBACK(f) ((OsmGpsMapOsdCallback) (f))
99    
100    /* the osd structure mainly contains various callbacks */
101    /* required to draw and update the OSD */
102    typedef struct osm_gps_map_osd_s {
103        GdkPixmap *pixmap;   // the main pixmap (to draw on it)
104        GtkWidget *widget;   // the main map widget (to get its stlye info)
105    
106        void(*render)(struct osm_gps_map_osd_s *);
107        void(*draw)(struct osm_gps_map_osd_s *, gint, gint);
108        void(*restore)(struct osm_gps_map_osd_s *) ;
109        osd_button_t(*check)(gint, gint);       /* check if x/y lies within OSD */
110        void(*free)(struct osm_gps_map_osd_s *);
111    
112        OsmGpsMapOsdCallback cb;
113        gpointer data;
114    
115        gpointer priv;
116    } osm_gps_map_osd_t;
117    
118  typedef void (*OsmGpsMapBalloonCallback)(cairo_t *, OsmGpsMapRect_t *rect,  typedef void (*OsmGpsMapBalloonCallback)(cairo_t *, OsmGpsMapRect_t *rect,
119                                           gpointer data);                                           gpointer data);
120  #define OSM_GPS_MAP_BALLOON_CALLBACK(f) ((OsmGpsMapBalloonCallback) (f))  #define OSM_GPS_MAP_BALLOON_CALLBACK(f) ((OsmGpsMapBalloonCallback) (f))
121    
 typedef void (*OsmGpsMapOsdGpsCallback)(gpointer data);  
 #define OSM_GPS_MAP_OSD_GPS_CALLBACK(f) ((OsmGpsMapOsdGpsCallback) (f))  
   
122  GType osm_gps_map_get_type (void) G_GNUC_CONST;  GType osm_gps_map_get_type (void) G_GNUC_CONST;
123    
124  const char* osm_gps_map_source_get_friendly_name(OsmGpsMapSource_t source);  const char* osm_gps_map_source_get_friendly_name(OsmGpsMapSource_t source);
# Line 137  void osm_gps_map_draw_balloon (OsmGpsMap Line 155  void osm_gps_map_draw_balloon (OsmGpsMap
155  void osm_gps_map_clear_balloon (OsmGpsMap *map);  void osm_gps_map_clear_balloon (OsmGpsMap *map);
156  #endif  #endif
157  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
158  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdGpsCallback cb, gpointer data);  void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd);
159  osd_button_t osm_gps_map_osd_check(gint x, gint y);  void osm_gps_map_redraw (OsmGpsMap *map);
160    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);
161  #endif  #endif
162    
163    

Legend:
Removed from v.72  
changed lines
  Added in v.73