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

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

revision 103 by harbaum, Wed Sep 9 11:50:50 2009 UTC revision 231 by harbaum, Mon Dec 7 16:14:50 2009 UTC
# Line 19  Line 19 
19    
20  #include "config.h"  #include "config.h"
21  #include <stdlib.h>  // abs  #include <stdlib.h>  // abs
22    #include <string.h>
23  #include <math.h>    // M_PI/cos()  #include <math.h>    // M_PI/cos()
24    
25  /* parameters that can be overwritten from the config file: */  /* parameters that can be overwritten from the config file: */
26  /* OSD_DIAMETER */  /* OSD_DIAMETER */
27  /* OSD_X, OSD_Y */  /* OSD_X, OSD_Y */
28    
 #ifndef OSD_SCALE_FONT_SIZE  
 #define OSD_SCALE_FONT_SIZE 12  
 #endif  
 #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)  
 #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)  
   
29  #ifndef USE_CAIRO  #ifndef USE_CAIRO
30  #error "OSD control display lacks a non-cairo implementation!"  #error "OSD control display lacks a non-cairo implementation!"
31  #endif  #endif
# Line 38  Line 33 
33  #include <cairo.h>  #include <cairo.h>
34    
35  #include "osm-gps-map.h"  #include "osm-gps-map.h"
36    #include "converter.h"
37  #include "osm-gps-map-osd-classic.h"  #include "osm-gps-map-osd-classic.h"
38    
39  //the osd controls  //the osd controls
40  typedef struct {  typedef struct {
41      /* the offscreen representation of the OSD */      /* the offscreen representation of the OSD */
42      cairo_surface_t *overlay;      struct {
43            cairo_surface_t *surface;
44            gboolean rendered;
45    #ifdef OSD_GPS_BUTTON
46            gboolean gps_enabled;
47    #endif
48        } controls;
49    
50    #ifdef OSD_BALLOON
51        //a balloon with additional info
52        struct {
53            cairo_surface_t *surface;
54            int orientation, offset_x, offset_y;
55    
56            gboolean just_created;
57            float lat, lon;
58            OsmGpsMapRect_t rect;
59    
60            /* function called to have the user app draw the contents */
61            OsmGpsMapBalloonCallback cb;
62            gpointer data;
63        } balloon;
64    #endif
65    
66  #ifdef OSD_SCALE  #ifdef OSD_SCALE
67      cairo_surface_t *scale;      struct {
68      int scale_zoom;          cairo_surface_t *surface;
69            int zoom;
70        } scale;
71    #endif
72    
73    #ifdef OSD_CROSSHAIR
74        struct {
75            cairo_surface_t *surface;
76            gboolean rendered;
77        } crosshair;
78    #endif
79    
80    #ifdef OSD_NAV
81        struct {
82            cairo_surface_t *surface;
83            float lat, lon;
84            char *name;
85            gboolean imperial, mode;    // display distance imperial/metric
86            int click_sep;
87        } nav;
88    #endif
89    
90    #ifdef OSD_COORDINATES
91        struct {
92            cairo_surface_t *surface;
93            float lat, lon;
94        } coordinates;
95  #endif  #endif
96    
97  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
98      /* values to handle the "source" menu */      struct {
99      cairo_surface_t *map_source;          /* values to handle the "source" menu */
100      gboolean expanded;          cairo_surface_t *surface;
101      gint shift, dir, count;          gboolean expanded;
102      gint handler_id;          gint shift, dir, count;
103      gint width, height;          gint handler_id;
104            gint width, height;
105            gboolean rendered;
106        } source_sel;
107  #endif  #endif
108    
109  } osd_priv_t;  } osd_priv_t;
110    
111    #ifdef OSD_BALLOON
112    /* most visual effects are hardcoded by now, but may be made */
113    /* available via properties later */
114    #ifndef BALLOON_AREA_WIDTH
115    #define BALLOON_AREA_WIDTH           290
116    #endif
117    #ifndef BALLOON_AREA_HEIGHT
118    #define BALLOON_AREA_HEIGHT           75
119    #endif
120    #ifndef BALLOON_CORNER_RADIUS
121    #define BALLOON_CORNER_RADIUS         10
122    #endif
123    
124    #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
125    #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
126    #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
127    #define BALLOON_TRANSPARENCY         0.8
128    #define POINTER_HEIGHT                20
129    #define POINTER_FOOT_WIDTH            20
130    #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
131    #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
132    #define BALLOON_SHADOW_TRANSPARENCY  0.2
133    
134    #define BALLOON_W  (BALLOON_WIDTH + BALLOON_SHADOW)
135    #define BALLOON_H  (BALLOON_HEIGHT + POINTER_HEIGHT + BALLOON_SHADOW)
136    
137    #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
138    
139    /* draw the bubble shape. this is used twice, once for the shape and once */
140    /* for the shadow */
141    static void
142    osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
143           gboolean bottom, int px, int py, int px0, int px1) {
144    
145        cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
146        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
147                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
148        if(!bottom) {
149            /* insert top pointer */
150            cairo_line_to (cr, px1, y0);
151            cairo_line_to (cr, px, py);
152            cairo_line_to (cr, px0, y0);
153        }
154    
155        cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
156        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
157                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
158        cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
159        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
160                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
161        if(bottom) {
162            /* insert bottom pointer */
163            cairo_line_to (cr, px0, y1);
164            cairo_line_to (cr, px, py);
165            cairo_line_to (cr, px1, y1);
166        }
167    
168        cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
169        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
170                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
171    
172        cairo_close_path (cr);
173    }
174    
175    static void
176    osd_render_balloon(osm_gps_map_osd_t *osd) {
177        osd_priv_t *priv = (osd_priv_t*)osd->priv;
178    
179        if(!priv->balloon.surface)
180            return;
181    
182        /* get zoom */
183        gint zoom;
184        g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
185    
186        /* ------- convert given coordinate into screen position --------- */
187        gint xs, ys;
188        osm_gps_map_geographic_to_screen (OSM_GPS_MAP(osd->widget),
189                                          priv->balloon.lat, priv->balloon.lon,
190                                          &xs, &ys);
191    
192        gint x0 = 1, y0 = 1;
193    
194        /* check position of this relative to screen center to determine */
195        /* pointer direction ... */
196        int pointer_x, pointer_x0, pointer_x1;
197        int pointer_y;
198    
199        /* ... and calculate position */
200        int orientation = 0;
201        if(xs > osd->widget->allocation.width/2) {
202            priv->balloon.offset_x = -BALLOON_WIDTH + POINTER_OFFSET;
203            pointer_x = x0 - priv->balloon.offset_x;
204            pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
205            pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;
206            orientation |= 1;
207        } else {
208            priv->balloon.offset_x = -POINTER_OFFSET;
209            pointer_x = x0 - priv->balloon.offset_x;
210            pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
211            pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;
212        }
213    
214        gboolean bottom = FALSE;
215        if(ys > osd->widget->allocation.height/2) {
216            priv->balloon.offset_y = -BALLOON_HEIGHT - POINTER_HEIGHT;
217            pointer_y = y0 - priv->balloon.offset_y;
218            bottom = TRUE;
219            orientation |= 2;
220        } else {
221            priv->balloon.offset_y = 0;
222            pointer_y = y0 - priv->balloon.offset_y;
223            y0 += POINTER_HEIGHT;
224        }
225    
226        /* if required orientation equals current one, then don't render */
227        /* anything */
228        if(orientation == priv->balloon.orientation)
229            return;
230    
231        priv->balloon.orientation = orientation;
232    
233        /* calculate bottom/right of box */
234        int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
235    
236        /* save balloon screen coordinates for later use */
237        priv->balloon.rect.x = x0 + BALLOON_BORDER;
238        priv->balloon.rect.y = y0 + BALLOON_BORDER;
239        priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
240        priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
241    
242        g_assert(priv->balloon.surface);
243        cairo_t *cr = cairo_create(priv->balloon.surface);
244        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
245        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
246        cairo_paint(cr);
247        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
248    
249        /* --------- draw shadow --------------- */
250        osm_gps_map_draw_balloon_shape (cr,
251                     x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW,
252                     x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,
253                     bottom, pointer_x, pointer_y,
254                     pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);
255    
256        cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);
257        cairo_fill_preserve (cr);
258        cairo_set_source_rgba (cr, 1, 0, 0, 1.0);
259        cairo_set_line_width (cr, 0);
260        cairo_stroke (cr);
261    
262        /* --------- draw main shape ----------- */
263        osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,
264                     bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);
265    
266        cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);
267        cairo_fill_preserve (cr);
268        cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);
269        cairo_set_line_width (cr, 1);
270        cairo_stroke (cr);
271    
272        if (priv->balloon.cb) {
273            osm_gps_map_balloon_event_t event;
274    
275            /* clip in case application tries to draw in */
276                /* exceed of the balloon */
277            cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
278                             priv->balloon.rect.w, priv->balloon.rect.h);
279            cairo_clip (cr);
280            cairo_new_path (cr);  /* current path is not consumed by cairo_clip */
281    
282            /* request the application to draw the balloon contents */
283            event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW;
284            event.data.draw.rect = &priv->balloon.rect;
285            event.data.draw.cr = cr;
286    
287            priv->balloon.cb(&event, priv->balloon.data);
288        }
289    
290        cairo_destroy(cr);
291    }
292    
293    /* return true if balloon is being displayed and if */
294    /* the given coordinate is within this balloon */
295    static gboolean
296    osd_balloon_check(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y)
297    {
298        osd_priv_t *priv = (osd_priv_t*)osd->priv;
299    
300        if(!priv->balloon.surface)
301            return FALSE;
302    
303        gint xs, ys;
304        osm_gps_map_geographic_to_screen (OSM_GPS_MAP(osd->widget),
305                                          priv->balloon.lat, priv->balloon.lon,
306                                          &xs, &ys);
307    
308        xs += priv->balloon.rect.x + priv->balloon.offset_x;
309        ys += priv->balloon.rect.y + priv->balloon.offset_y;
310    
311        gboolean is_in =
312            (x > xs) && (x < xs + priv->balloon.rect.w) &&
313            (y > ys) && (y < ys + priv->balloon.rect.h);
314    
315        /* is this a real click or is the application just checking for something? */
316        if(click) {
317    
318            /* handle the fact that the balloon may have been created by the */
319            /* button down event */
320            if(!is_in && !down && !priv->balloon.just_created) {
321                /* the user actually clicked outside the balloon */
322    
323                /* close the balloon! */
324                osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));
325    
326                /* and inform application about this */
327                if(priv->balloon.cb) {
328                    osm_gps_map_balloon_event_t event;
329                    event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED;
330                    priv->balloon.cb(&event, priv->balloon.data);
331                }
332    
333            }
334    
335            if(is_in && priv->balloon.cb) {
336                osm_gps_map_balloon_event_t event;
337    
338                /* notify application of click */
339                event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK;
340                event.data.click.x = x - xs;
341                event.data.click.y = y - ys;
342                event.data.click.down = down;
343    
344                priv->balloon.cb(&event, priv->balloon.data);
345            }
346        }
347        return is_in;
348    }
349    
350    void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {
351        g_return_if_fail (OSM_IS_GPS_MAP (map));
352    
353        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
354        g_return_if_fail (osd);
355    
356        osd_priv_t *priv = (osd_priv_t*)osd->priv;
357        g_return_if_fail (priv);
358    
359        if(priv->balloon.surface) {
360            cairo_surface_destroy(priv->balloon.surface);
361            priv->balloon.surface = NULL;
362            priv->balloon.lat = OSM_GPS_MAP_INVALID;
363            priv->balloon.lon = OSM_GPS_MAP_INVALID;
364        }
365        osm_gps_map_redraw(map);
366    }
367    
368    void
369    osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
370                                  OsmGpsMapBalloonCallback cb, gpointer data) {
371        g_return_if_fail (OSM_IS_GPS_MAP (map));
372    
373        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
374        g_return_if_fail (osd);
375    
376        osd_priv_t *priv = (osd_priv_t*)osd->priv;
377        g_return_if_fail (priv);
378    
379        osm_gps_map_osd_clear_balloon (map);
380    
381        /* allocate balloon surface */
382        priv->balloon.surface =
383            cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
384                                       BALLOON_W+2, BALLOON_H+2);
385    
386        priv->balloon.lat = latitude;
387        priv->balloon.lon = longitude;
388        priv->balloon.cb = cb;
389        priv->balloon.data = data;
390        priv->balloon.just_created = TRUE;
391    
392        priv->balloon.orientation = -1;
393    
394        osd_render_balloon(osd);
395    
396        osm_gps_map_redraw(map);
397    }
398    
399    #endif // OSD_BALLOON
400    
401  /* position and extent of bounding box */  /* position and extent of bounding box */
402  #ifndef OSD_X  #ifndef OSD_X
403  #define OSD_X      (10)  #define OSD_X      (10)
# Line 283  osd_check_zoom(gint x, gint y) { Line 620  osd_check_zoom(gint x, gint y) {
620  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)
621    
622  /* size of usable area when expanded */  /* size of usable area when expanded */
623  #define OSD_S_AREA_W (priv->width)  #define OSD_S_AREA_W (priv->source_sel.width)
624  #define OSD_S_AREA_H (priv->height)  #define OSD_S_AREA_H (priv->source_sel.height)
625  #define OSD_S_EXP_W  (OSD_S_PW + OSD_S_AREA_W + OSD_SHADOW)  #define OSD_S_EXP_W  (OSD_S_PW + OSD_S_AREA_W + OSD_SHADOW)
626  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)
627    
628  /* internal value to draw the arrow on the "puller" */  /* internal value to draw the arrow on the "puller" */
629  #define OSD_S_D0  (OSD_S_RAD/2)  #define OSD_S_D0  (OSD_S_RAD/2)
630  #ifndef OSD_FONT_SIZE  #ifndef OSD_FONT_SIZE
631  #define OSD_FONT_SIZE 16.0  #define OSD_FONT_SIZE (16.0)
632  #endif  #endif
633  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)
634  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)
# Line 300  osd_check_zoom(gint x, gint y) { Line 637  osd_check_zoom(gint x, gint y) {
637  /* or the entire menu incl. the puller (expanded) */  /* or the entire menu incl. the puller (expanded) */
638  static void  static void
639  osd_source_shape(osd_priv_t *priv, cairo_t *cr, gint x, gint y) {  osd_source_shape(osd_priv_t *priv, cairo_t *cr, gint x, gint y) {
640      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
641          /* just draw the puller */          /* just draw the puller */
642          cairo_move_to (cr, x + OSD_S_PW, y + OSD_S_PH);          cairo_move_to (cr, x + OSD_S_PW, y + OSD_S_PH);
643          cairo_arc (cr, x+OSD_S_RAD, y+OSD_S_RAD, OSD_S_RAD, M_PI/2, -M_PI/2);          cairo_arc (cr, x+OSD_S_RAD, y+OSD_S_RAD, OSD_S_RAD, M_PI/2, -M_PI/2);
# Line 328  osd_source_content(osm_gps_map_osd_t *os Line 665  osd_source_content(osm_gps_map_osd_t *os
665    
666      int py = offset + OSD_S_RAD - OSD_S_D0;      int py = offset + OSD_S_RAD - OSD_S_D0;
667    
668      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
669          /* draw the "puller" open (<) arrow */          /* draw the "puller" open (<) arrow */
670          cairo_move_to (cr, offset + OSD_S_RAD + OSD_S_D0/2, py);          cairo_move_to (cr, offset + OSD_S_RAD + OSD_S_D0/2, py);
671          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);
# Line 353  osd_source_content(osm_gps_map_osd_t *os Line 690  osd_source_content(osm_gps_map_osd_t *os
690                                      CAIRO_FONT_WEIGHT_BOLD);                                      CAIRO_FONT_WEIGHT_BOLD);
691              cairo_set_font_size (cr, OSD_FONT_SIZE);              cairo_set_font_size (cr, OSD_FONT_SIZE);
692    
693              int i, step = (priv->height - 2*OSD_TEXT_BORDER) /              int i, step = (priv->source_sel.height - 2*OSD_TEXT_BORDER) /
694                  OSM_GPS_MAP_SOURCE_LAST;                  OSM_GPS_MAP_SOURCE_LAST;
695              for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {              for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {
696                  cairo_text_extents_t extents;                  cairo_text_extents_t extents;
# Line 367  osd_source_content(osm_gps_map_osd_t *os Line 704  osd_source_content(osm_gps_map_osd_t *os
704                  if(source == i) {                  if(source == i) {
705                      cairo_rectangle(cr, x - OSD_TEXT_BORDER/2,                      cairo_rectangle(cr, x - OSD_TEXT_BORDER/2,
706                                      y - OSD_TEXT_SKIP,                                      y - OSD_TEXT_SKIP,
707                                      priv->width - OSD_TEXT_BORDER,                                      priv->source_sel.width - OSD_TEXT_BORDER,
708                                      step + OSD_TEXT_SKIP);                                      step + OSD_TEXT_SKIP);
709                      cairo_fill(cr);                      cairo_fill(cr);
710    
# Line 398  osd_source_content(osm_gps_map_osd_t *os Line 735  osd_source_content(osm_gps_map_osd_t *os
735  }  }
736    
737  static void  static void
738  osd_render_source_sel(osm_gps_map_osd_t *osd) {  osd_render_source_sel(osm_gps_map_osd_t *osd, gboolean force_rerender) {
739      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
740    
741        if(!priv->source_sel.surface ||
742           (priv->source_sel.rendered && !force_rerender))
743            return;
744    
745        priv->source_sel.rendered = TRUE;
746    
747  #ifndef OSD_COLOR  #ifndef OSD_COLOR
748      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];
749      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];
# Line 408  osd_render_source_sel(osm_gps_map_osd_t Line 751  osd_render_source_sel(osm_gps_map_osd_t
751  #endif  #endif
752    
753      /* draw source selector */      /* draw source selector */
754      cairo_t *cr = cairo_create(priv->map_source);      g_assert(priv->source_sel.surface);
755        cairo_t *cr = cairo_create(priv->source_sel.surface);
756      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
757      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
758      cairo_paint(cr);      cairo_paint(cr);
# Line 449  osd_source_reallocate(osm_gps_map_osd_t Line 793  osd_source_reallocate(osm_gps_map_osd_t
793      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
794    
795      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
796      g_assert (priv->map_source);      g_assert (priv->source_sel.surface);
797    
798      int w = OSD_S_W, h = OSD_S_H;      int w = OSD_S_W, h = OSD_S_H;
799      if(priv->expanded) {      if(priv->source_sel.expanded) {
800          cairo_text_extents_t extents;          cairo_text_extents_t extents;
801    
802          /* determine content size */          /* determine content size */
803          cairo_t *cr = cairo_create(priv->map_source);          g_assert(priv->source_sel.surface);
804            cairo_t *cr = cairo_create(priv->source_sel.surface);
805          cairo_select_font_face (cr, "Sans",          cairo_select_font_face (cr, "Sans",
806                                  CAIRO_FONT_SLANT_NORMAL,                                  CAIRO_FONT_SLANT_NORMAL,
807                                  CAIRO_FONT_WEIGHT_BOLD);                                  CAIRO_FONT_WEIGHT_BOLD);
# Line 473  osd_source_reallocate(osm_gps_map_osd_t Line 818  osd_source_reallocate(osm_gps_map_osd_t
818          }          }
819          cairo_destroy(cr);          cairo_destroy(cr);
820    
821          priv->width  = max_w + 2*OSD_TEXT_BORDER;          priv->source_sel.width  = max_w + 2*OSD_TEXT_BORDER;
822          priv->height = OSM_GPS_MAP_SOURCE_LAST *          priv->source_sel.height = OSM_GPS_MAP_SOURCE_LAST *
823              (max_h + 2*OSD_TEXT_SKIP) + 2*OSD_TEXT_BORDER;              (max_h + 2*OSD_TEXT_SKIP) + 2*OSD_TEXT_BORDER;
824    
825          w = OSD_S_EXP_W;          w = OSD_S_EXP_W;
826          h = OSD_S_EXP_H;          h = OSD_S_EXP_H;
827      }      }
828    
829      cairo_surface_destroy(priv->map_source);      cairo_surface_destroy(priv->source_sel.surface);
830      priv->map_source =      priv->source_sel.surface =
831          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
832    
833      osd_render_source_sel(osd);      osd_render_source_sel(osd, TRUE);
834  }  }
835    
836  #define OSD_HZ      15  #define OSD_HZ      15
# Line 496  static gboolean osd_source_animate(gpoin Line 841  static gboolean osd_source_animate(gpoin
841      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
842      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;
843      gboolean done = FALSE;      gboolean done = FALSE;
844      priv->count += priv->dir;      priv->source_sel.count += priv->source_sel.dir;
845    
846      /* shifting in */      /* shifting in */
847      if(priv->dir < 0) {      if(priv->source_sel.dir < 0) {
848          if(priv->count <= 0) {          if(priv->source_sel.count <= 0) {
849              priv->count = 0;              priv->source_sel.count = 0;
850              done = TRUE;              done = TRUE;
851          }          }
852      } else {      } else {
853          if(priv->count >= 1000) {          if(priv->source_sel.count >= 1000) {
854              priv->expanded = FALSE;              priv->source_sel.expanded = FALSE;
855              osd_source_reallocate(osd);              osd_source_reallocate(osd);
856    
857              priv->count = 1000;              priv->source_sel.count = 1000;
858              done = TRUE;              done = TRUE;
859          }          }
860      }      }
# Line 517  static gboolean osd_source_animate(gpoin Line 862  static gboolean osd_source_animate(gpoin
862    
863      /* count runs linearly from 0 to 1000, map this nicely onto a position */      /* count runs linearly from 0 to 1000, map this nicely onto a position */
864    
865      /* nicer sinoid mapping */      /* nice sinoid mapping */
866      float m = 0.5-cos(priv->count * M_PI / 1000.0)/2;      float m = 0.5-cos(priv->source_sel.count * M_PI / 1000.0)/2;
867      priv->shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +      priv->source_sel.shift =
868            (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +
869          m * diff;          m * diff;
870    
871        /* make sure the screen is updated */
872      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
873    
874        /* stop animation if done */
875      if(done)      if(done)
876          priv->handler_id = 0;          priv->source_sel.handler_id = 0;
877    
878      return !done;      return !done;
879  }  }
# Line 537  osd_source_toggle(osm_gps_map_osd_t *osd Line 885  osd_source_toggle(osm_gps_map_osd_t *osd
885      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
886    
887      /* ignore clicks while animation is running */      /* ignore clicks while animation is running */
888      if(priv->handler_id)      if(priv->source_sel.handler_id)
889          return;          return;
890    
891      /* expand immediately, collapse is handle at the end of the collapse animation */      /* expand immediately, collapse is handle at the end of the */
892      if(!priv->expanded) {      /* collapse animation */
893          priv->expanded = TRUE;      if(!priv->source_sel.expanded) {
894            priv->source_sel.expanded = TRUE;
895          osd_source_reallocate(osd);          osd_source_reallocate(osd);
896    
897          priv->count = 1000;          priv->source_sel.count = 1000;
898          priv->shift = osd->widget->allocation.width - OSD_S_W;          priv->source_sel.shift = osd->widget->allocation.width - OSD_S_W;
899          priv->dir = -1000/OSD_HZ;          priv->source_sel.dir = -1000/OSD_HZ;
900      } else {      } else {
901          priv->count =  0;          priv->source_sel.count =  0;
902          priv->shift = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;          priv->source_sel.shift = osd->widget->allocation.width -
903          priv->dir = +1000/OSD_HZ;              OSD_S_EXP_W + OSD_S_X;
904            priv->source_sel.dir = +1000/OSD_HZ;
905      }      }
906    
907      priv->handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ, osd_source_animate, osd);      /* start timer to handle animation */
908        priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,
909                                                      osd_source_animate, osd);
910  }  }
911    
912  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
913  static osd_button_t  static osd_button_t
914  osd_source_check(osm_gps_map_osd_t *osd, gint x, gint y) {  osd_source_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
915      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
916    
917      if(!priv->expanded)      if(!priv->source_sel.expanded)
918          x -= osd->widget->allocation.width - OSD_S_W;          x -= osd->widget->allocation.width - OSD_S_W;
919      else      else
920          x -= osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;          x -= osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;
# Line 577  osd_source_check(osm_gps_map_osd_t *osd, Line 929  osd_source_check(osm_gps_map_osd_t *osd,
929          /* really within puller shape? */          /* really within puller shape? */
930          if(x > Z_RAD || osm_gps_map_in_circle(x, y, Z_RAD, Z_RAD, Z_RAD)) {          if(x > Z_RAD || osm_gps_map_in_circle(x, y, Z_RAD, Z_RAD, Z_RAD)) {
931              /* expand source selector */              /* expand source selector */
932              osd_source_toggle(osd);              if(down)
933                    osd_source_toggle(osd);
934    
935              /* tell upper layers that user clicked some background element */              /* tell upper layers that user clicked some background element */
936              /* of the OSD */              /* of the OSD */
# Line 586  osd_source_check(osm_gps_map_osd_t *osd, Line 939  osd_source_check(osm_gps_map_osd_t *osd,
939      }      }
940    
941      /* check for clicks into data area */      /* check for clicks into data area */
942      if(priv->expanded && !priv->handler_id) {      if(priv->source_sel.expanded && !priv->source_sel.handler_id) {
943          /* re-adjust from puller top to content top */          /* re-adjust from puller top to content top */
944          if(OSD_S_Y < 0)          if(OSD_S_Y < 0)
945              y += OSD_S_EXP_H - OSD_S_PH;              y += OSD_S_EXP_H - OSD_S_PH;
# Line 596  osd_source_check(osm_gps_map_osd_t *osd, Line 949  osd_source_check(osm_gps_map_osd_t *osd,
949             y > 0 &&             y > 0 &&
950             y < OSD_S_EXP_H) {             y < OSD_S_EXP_H) {
951    
952              int step = (priv->height - 2*OSD_TEXT_BORDER)              int step = (priv->source_sel.height - 2*OSD_TEXT_BORDER)
953                  / OSM_GPS_MAP_SOURCE_LAST;                  / OSM_GPS_MAP_SOURCE_LAST;
954    
955              y -= OSD_TEXT_BORDER - OSD_TEXT_SKIP;              y -= OSD_TEXT_BORDER - OSD_TEXT_SKIP;
956              y /= step;              y /= step;
957              y += 1;              y += 1;
958    
959              gint old = 0;              if(down) {
960              g_object_get(osd->widget, "map-source", &old, NULL);                  gint old = 0;
961                    g_object_get(osd->widget, "map-source", &old, NULL);
962              if(y > OSM_GPS_MAP_SOURCE_NULL &&  
963                 y <= OSM_GPS_MAP_SOURCE_LAST &&                  if(y > OSM_GPS_MAP_SOURCE_NULL &&
964                 old != y) {                     y <= OSM_GPS_MAP_SOURCE_LAST &&
965                  g_object_set(osd->widget, "map-source", y, NULL);                     old != y) {
966                        g_object_set(osd->widget, "map-source", y, NULL);
967                  osd_render_source_sel(osd);  
968                  osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));                      osd_render_source_sel(osd, TRUE);
969                        osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
970                    }
971              }              }
972    
973              /* return "clicked in OSD background" to prevent further */              /* return "clicked in OSD background" to prevent further */
974              /* processing by application */              /* processing by application */
975              return OSD_BG;              return OSD_BG;
# Line 625  osd_source_check(osm_gps_map_osd_t *osd, Line 980  osd_source_check(osm_gps_map_osd_t *osd,
980  }  }
981  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
982    
 static osd_button_t  
 osd_check(osm_gps_map_osd_t *osd, gint x, gint y) {  
     osd_button_t but = OSD_NONE;  
   
 #ifdef OSD_SOURCE_SEL  
     /* the source selection area is handles internally */  
     but = osd_source_check(osd, x, y);  
     if(but != OSD_NONE)  
         return but;  
 #endif  
   
     x -= OSD_X;  
     y -= OSD_Y;  
   
     if(OSD_X < 0)  
         x -= (osd->widget->allocation.width - OSD_W);  
   
     if(OSD_Y < 0)  
         y -= (osd->widget->allocation.height - OSD_H);  
   
     /* first do a rough test for the OSD area. */  
     /* this is just to avoid an unnecessary detailed test */  
     if(x > 0 && x < OSD_W && y > 0 && y < OSD_H) {  
 #ifndef OSD_NO_DPAD  
         but = osd_check_dpad(x, y);  
 #endif  
   
         if(but == OSD_NONE)  
             but = osd_check_zoom(x, y);  
     }  
   
     return but;  
 }  
   
983  #ifndef OSD_NO_DPAD  #ifndef OSD_NO_DPAD
984  static void  static void
985  osd_dpad_labels(cairo_t *cr, gint x, gint y) {  osd_dpad_labels(cairo_t *cr, gint x, gint y) {
# Line 729  osd_zoom_labels(cairo_t *cr, gint x, gin Line 1050  osd_zoom_labels(cairo_t *cr, gint x, gin
1050      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);
1051  }  }
1052    
1053    #ifdef OSD_COORDINATES
1054    
1055    #ifndef OSD_COORDINATES_FONT_SIZE
1056    #define OSD_COORDINATES_FONT_SIZE (12.0)
1057    #endif
1058    
1059    #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
1060    
1061    #define OSD_COORDINATES_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)
1062    #define OSD_COORDINATES_H  (2*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET+OSD_COORDINATES_FONT_SIZE/4)
1063    
1064    /* these can be overwritten with versions that support */
1065    /* localization */
1066    #ifndef OSD_COORDINATES_CHR_N
1067    #define OSD_COORDINATES_CHR_N  "N"
1068    #endif
1069    #ifndef OSD_COORDINATES_CHR_S
1070    #define OSD_COORDINATES_CHR_S  "S"
1071    #endif
1072    #ifndef OSD_COORDINATES_CHR_E
1073    #define OSD_COORDINATES_CHR_E  "E"
1074    #endif
1075    #ifndef OSD_COORDINATES_CHR_W
1076    #define OSD_COORDINATES_CHR_W  "W"
1077    #endif
1078    
1079    
1080    
1081    /* this is the classic geocaching notation */
1082    static char
1083    *osd_latitude_str(float latitude) {
1084        char *c = OSD_COORDINATES_CHR_N;
1085        float integral, fractional;
1086    
1087        if(isnan(latitude))
1088            return NULL;
1089    
1090        if(latitude < 0) {
1091            latitude = fabs(latitude);
1092            c = OSD_COORDINATES_CHR_S;
1093        }
1094    
1095        fractional = modff(latitude, &integral);
1096    
1097        return g_strdup_printf("%s %02d° %06.3f'",
1098                               c, (int)integral, fractional*60.0);
1099    }
1100    
1101    static char
1102    *osd_longitude_str(float longitude) {
1103        char *c = OSD_COORDINATES_CHR_E;
1104        float integral, fractional;
1105    
1106        if(isnan(longitude))
1107            return NULL;
1108    
1109        if(longitude < 0) {
1110            longitude = fabs(longitude);
1111            c = OSD_COORDINATES_CHR_W;
1112        }
1113    
1114        fractional = modff(longitude, &integral);
1115    
1116        return g_strdup_printf("%s %03d° %06.3f'",
1117                               c, (int)integral, fractional*60.0);
1118    }
1119    
1120    /* render a string at the given screen position */
1121    static int
1122    osd_render_centered_text(cairo_t *cr, int y, int width, char *text) {
1123        if(!text) return y;
1124    
1125        char *p = g_malloc(strlen(text)+4);  // space for "...\n"
1126        strcpy(p, text);
1127    
1128        cairo_text_extents_t extents;
1129        memset(&extents, 0, sizeof(cairo_text_extents_t));
1130        cairo_text_extents (cr, p, &extents);
1131        g_assert(extents.width != 0.0);
1132    
1133        /* check if text needs to be truncated */
1134        int trunc_at = strlen(text);
1135        while(extents.width > width) {
1136    
1137            /* cut off all utf8 multibyte remains so the actual */
1138            /* truncation only deals with one byte */
1139            while((p[trunc_at-1] & 0xc0) == 0x80) {
1140                trunc_at--;
1141                g_assert(trunc_at > 0);
1142            }
1143    
1144            trunc_at--;
1145            g_assert(trunc_at > 0);
1146    
1147            strcpy(p+trunc_at, "...");
1148            cairo_text_extents (cr, p, &extents);
1149        }
1150    
1151        cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
1152        cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);
1153        cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);
1154        cairo_text_path (cr, p);
1155        cairo_stroke (cr);
1156    
1157        cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
1158        cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);
1159        cairo_show_text (cr, p);
1160    
1161        g_free(p);
1162    
1163        /* skip + 1/5 line */
1164        return y + 6*OSD_COORDINATES_FONT_SIZE/5;
1165    }
1166    
1167    static void
1168    osd_render_coordinates(osm_gps_map_osd_t *osd)
1169    {
1170        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1171    
1172        if(!priv->coordinates.surface)
1173            return;
1174    
1175        /* get current map position */
1176        gfloat lat, lon;
1177        g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
1178    
1179        /* check if position has changed enough to require redraw */
1180        if(!isnan(priv->coordinates.lat) && !isnan(priv->coordinates.lon))
1181            /* 1/60000 == 1/1000 minute */
1182            if((fabsf(lat - priv->coordinates.lat) < 1/60000) &&
1183               (fabsf(lon - priv->coordinates.lon) < 1/60000))
1184                return;
1185    
1186        priv->coordinates.lat = lat;
1187        priv->coordinates.lon = lon;
1188    
1189        /* first fill with transparency */
1190    
1191        g_assert(priv->coordinates.surface);
1192        cairo_t *cr = cairo_create(priv->coordinates.surface);
1193        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1194        //    cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.5);
1195        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
1196        cairo_paint(cr);
1197        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1198    
1199        cairo_select_font_face (cr, "Sans",
1200                                CAIRO_FONT_SLANT_NORMAL,
1201                                CAIRO_FONT_WEIGHT_BOLD);
1202        cairo_set_font_size (cr, OSD_COORDINATES_FONT_SIZE);
1203    
1204        char *latitude = osd_latitude_str(lat);
1205        char *longitude = osd_longitude_str(lon);
1206    
1207        int y = OSD_COORDINATES_OFFSET;
1208        y = osd_render_centered_text(cr, y, OSD_COORDINATES_W, latitude);
1209        y = osd_render_centered_text(cr, y, OSD_COORDINATES_W, longitude);
1210    
1211        g_free(latitude);
1212        g_free(longitude);
1213    
1214        cairo_destroy(cr);
1215    }
1216    #endif  // OSD_COORDINATES
1217    
1218    #ifdef OSD_NAV
1219    #define OSD_NAV_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)
1220    #define OSD_NAV_H  (11*OSD_COORDINATES_FONT_SIZE)
1221    
1222    /* http://mathforum.org/library/drmath/view/55417.html */
1223    static float get_bearing(float lat1, float lon1, float lat2, float lon2) {
1224      return atan2( sin(lon2 - lon1) * cos(lat2),
1225                    cos(lat1) * sin(lat2) -
1226                    sin(lat1) * cos(lat2) * cos(lon2 - lon1));
1227    }
1228    
1229    /* http://mathforum.org/library/drmath/view/51722.html */
1230    static float get_distance(float lat1, float lon1, float lat2, float lon2) {
1231      float aob = acos(cos(lat1) * cos(lat2) * cos(lon2 - lon1) +
1232                       sin(lat1) * sin(lat2));
1233    
1234      //  return(aob * 3959.0);   /* great circle radius in miles */
1235    
1236      return(aob * 6371000.0);     /* great circle radius in meters */
1237    }
1238    
1239    static void
1240    osd_render_nav(osm_gps_map_osd_t *osd)
1241    {
1242        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1243    
1244        if(!priv->nav.surface || isnan(priv->nav.lat) || isnan(priv->nav.lon))
1245            return;
1246    
1247        /* first fill with transparency */
1248        g_assert(priv->nav.surface);
1249        cairo_t *cr = cairo_create(priv->nav.surface);
1250        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1251        cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
1252        cairo_paint(cr);
1253        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1254    
1255        cairo_select_font_face (cr, "Sans",
1256                                CAIRO_FONT_SLANT_NORMAL,
1257                                CAIRO_FONT_WEIGHT_BOLD);
1258        cairo_set_font_size (cr, OSD_COORDINATES_FONT_SIZE);
1259    
1260        char *latitude = osd_latitude_str(priv->nav.lat);
1261        char *longitude = osd_longitude_str(priv->nav.lon);
1262    
1263        int y = OSD_COORDINATES_OFFSET;
1264        y = osd_render_centered_text(cr, y, OSD_NAV_W, priv->nav.name);
1265        y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);
1266        y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);
1267    
1268        g_free(latitude);
1269        g_free(longitude);
1270    
1271        /* everything below this is the compass. we need to know this */
1272        /* to differ between coordinate clicks and compass clicks */
1273        priv->nav.click_sep = y;
1274    
1275        /* draw the compass */
1276        int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;
1277        if(radius > OSD_NAV_W/2)
1278            radius = OSD_NAV_W/2;
1279    
1280        int x = OSD_NAV_W/2+1;
1281        y += radius;
1282    
1283        cairo_stroke (cr);
1284    
1285        /* draw background */
1286        cairo_arc(cr, x, y, radius, 0,  2*M_PI);
1287        cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
1288        cairo_fill_preserve (cr);
1289        cairo_set_source_rgb (cr, 0, 0, 0);
1290        cairo_set_line_width (cr, 1);
1291        cairo_stroke (cr);
1292    
1293        /* draw pointer */
1294    #define ARROW_WIDTH     0.3
1295    #define ARROW_LENGTH    0.7
1296    
1297        coord_t mpos, *pos = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));
1298        if(priv->nav.mode) {
1299            gfloat lat, lon;
1300            g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
1301            mpos.rlat = deg2rad(lat);
1302            mpos.rlon = deg2rad(lon);
1303            pos = &mpos;
1304        }
1305    
1306        if(pos) {
1307            float arot = get_bearing(pos->rlat, pos->rlon,
1308                         deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1309    
1310            cairo_move_to(cr,
1311                          x + radius *  ARROW_LENGTH *  sin(arot),
1312                          y + radius *  ARROW_LENGTH * -cos(arot));
1313    
1314            cairo_line_to(cr,
1315                          x + radius * -ARROW_LENGTH *  sin(arot+ARROW_WIDTH),
1316                          y + radius * -ARROW_LENGTH * -cos(arot+ARROW_WIDTH));
1317    
1318            cairo_line_to(cr,
1319                          x + radius * -0.5 * ARROW_LENGTH *  sin(arot),
1320                          y + radius * -0.5 * ARROW_LENGTH * -cos(arot));
1321    
1322            cairo_line_to(cr,
1323                          x + radius * -ARROW_LENGTH *  sin(arot-ARROW_WIDTH),
1324                          y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));
1325    
1326            cairo_close_path(cr);
1327            if(priv->nav.mode)
1328                cairo_set_source_rgb (cr, 0, 0, 0);
1329            else
1330                cairo_set_source_rgb (cr, 0, 0, 0.8);
1331    
1332            cairo_fill (cr);
1333    
1334            y += radius + OSD_COORDINATES_FONT_SIZE/4;
1335    
1336            float dist = get_distance(pos->rlat, pos->rlon,
1337                            deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1338    
1339            char *dist_str = NULL;
1340            if(!priv->nav.imperial) {
1341                /* metric is easy ... */
1342                if(dist<1000)
1343                    dist_str = g_strdup_printf("%u m", (int)dist);
1344                else
1345                    dist_str = g_strdup_printf("%.1f km", dist/1000);
1346            } else {
1347                /* and now the hard part: scale for useful imperial values :-( */
1348                /* try to convert to feet, 1ft == 0.3048 m */
1349    
1350                if(dist/(3*0.3048) >= 1760.0)      /* more than 1760 yard? */
1351                    dist_str = g_strdup_printf("%.1f mi", dist/(0.3048*3*1760.0));
1352                else if(dist/0.3048 >= 100)        /* more than 100 feet? */
1353                    dist_str = g_strdup_printf("%.1f yd", dist/(0.3048*3));
1354                else
1355                    dist_str = g_strdup_printf("%.0f ft", dist/0.3048);
1356            }
1357    
1358            y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);
1359            g_free(dist_str);
1360        }
1361    
1362        cairo_destroy(cr);
1363    }
1364    
1365    /* check if the user clicked inside the source selection area */
1366    static osd_button_t
1367    osd_nav_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
1368        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1369    
1370        if(!priv->nav.surface || down)
1371            return OSD_NONE;
1372    
1373        x -= OSD_X;
1374        if(OSD_X < 0)
1375            x -= (osd->widget->allocation.width - OSD_NAV_W);
1376    
1377        y -= (osd->widget->allocation.height - OSD_NAV_H)/2;
1378    
1379        if(x >= 0 && y >= 0 && x <= OSD_NAV_W && y <= OSD_NAV_H) {
1380            if(y < priv->nav.click_sep)
1381                osm_gps_map_set_center(OSM_GPS_MAP(osd->widget),
1382                                       priv->nav.lat, priv->nav.lon);
1383            else {
1384                priv->nav.mode = !priv->nav.mode;
1385                osm_gps_map_redraw(OSM_GPS_MAP(osd->widget));
1386            }
1387        }
1388    
1389        return OSD_NONE;
1390    }
1391    
1392    void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {
1393        g_return_if_fail (OSM_IS_GPS_MAP (map));
1394    
1395        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
1396        g_return_if_fail (osd);
1397    
1398        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1399        g_return_if_fail (priv);
1400    
1401        if(priv->nav.surface) {
1402            cairo_surface_destroy(priv->nav.surface);
1403            priv->nav.surface = NULL;
1404            priv->nav.lat = OSM_GPS_MAP_INVALID;
1405            priv->nav.lon = OSM_GPS_MAP_INVALID;
1406            if(priv->nav.name) g_free(priv->nav.name);
1407        }
1408        osm_gps_map_redraw(map);
1409    }
1410    
1411    void
1412    osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1413                              float latitude, float longitude, char *name) {
1414        g_return_if_fail (OSM_IS_GPS_MAP (map));
1415    
1416        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
1417        g_return_if_fail (osd);
1418    
1419        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1420        g_return_if_fail (priv);
1421    
1422        osm_gps_map_osd_clear_nav (map);
1423    
1424        /* allocate balloon surface */
1425        priv->nav.surface =
1426            cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1427                                       OSD_NAV_W+2, OSD_NAV_H+2);
1428    
1429        priv->nav.lat = latitude;
1430        priv->nav.lon = longitude;
1431        priv->nav.name = g_strdup(name);
1432        priv->nav.imperial = imperial;
1433    
1434        osd_render_nav(osd);
1435    
1436        osm_gps_map_redraw(map);
1437    }
1438    
1439    #endif // OSD_NAV
1440    
1441    static osd_button_t
1442    osd_check_int(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y) {
1443        osd_button_t but = OSD_NONE;
1444    
1445    #ifdef OSD_BALLOON
1446        if(down) {
1447            /* needed to handle balloons that are created at click */
1448            osd_priv_t *priv = (osd_priv_t*)osd->priv;
1449            priv->balloon.just_created = FALSE;
1450        }
1451    #endif
1452    
1453    #ifdef OSD_SOURCE_SEL
1454        /* the source selection area is handles internally */
1455        but = osd_source_check(osd, down, x, y);
1456    #endif
1457    
1458    #ifdef OSD_NAV
1459        if(but == OSD_NONE) {
1460            /* the source selection area is handles internally */
1461            but = osd_nav_check(osd, down, x, y);
1462        }
1463    #endif
1464    
1465        if(but == OSD_NONE) {
1466            gint mx = x - OSD_X;
1467            gint my = y - OSD_Y;
1468    
1469            if(OSD_X < 0)
1470                mx -= (osd->widget->allocation.width - OSD_W);
1471    
1472            if(OSD_Y < 0)
1473                my -= (osd->widget->allocation.height - OSD_H);
1474    
1475            /* first do a rough test for the OSD area. */
1476            /* this is just to avoid an unnecessary detailed test */
1477            if(mx > 0 && mx < OSD_W && my > 0 && my < OSD_H) {
1478    #ifndef OSD_NO_DPAD
1479                but = osd_check_dpad(mx, my);
1480    #endif
1481            }
1482    
1483            if(but == OSD_NONE)
1484                but = osd_check_zoom(mx, my);
1485        }
1486    
1487    #ifdef OSD_BALLOON
1488        if(but == OSD_NONE) {
1489            /* check if user clicked into balloon */
1490            if(osd_balloon_check(osd, click, down, x, y))
1491                but = OSD_BG;
1492        }
1493    #endif
1494    
1495        return but;
1496    }
1497    
1498    
1499    #ifdef OSD_CROSSHAIR
1500    
1501    #ifndef OSD_CROSSHAIR_RADIUS
1502    #define OSD_CROSSHAIR_RADIUS 10
1503    #endif
1504    
1505    #define OSD_CROSSHAIR_TICK  (OSD_CROSSHAIR_RADIUS/2)
1506    #define OSD_CROSSHAIR_BORDER (OSD_CROSSHAIR_TICK + OSD_CROSSHAIR_RADIUS/4)
1507    #define OSD_CROSSHAIR_W  ((OSD_CROSSHAIR_RADIUS+OSD_CROSSHAIR_BORDER)*2)
1508    #define OSD_CROSSHAIR_H  ((OSD_CROSSHAIR_RADIUS+OSD_CROSSHAIR_BORDER)*2)
1509    
1510    static void
1511    osd_render_crosshair_shape(cairo_t *cr) {
1512        cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,
1513                   OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);
1514    
1515        cairo_move_to (cr, OSD_CROSSHAIR_W/2 - OSD_CROSSHAIR_RADIUS,
1516                       OSD_CROSSHAIR_H/2);
1517        cairo_rel_line_to (cr, -OSD_CROSSHAIR_TICK, 0);
1518        cairo_move_to (cr, OSD_CROSSHAIR_W/2 + OSD_CROSSHAIR_RADIUS,
1519                       OSD_CROSSHAIR_H/2);
1520        cairo_rel_line_to (cr,  OSD_CROSSHAIR_TICK, 0);
1521    
1522        cairo_move_to (cr, OSD_CROSSHAIR_W/2,
1523                       OSD_CROSSHAIR_H/2 - OSD_CROSSHAIR_RADIUS);
1524        cairo_rel_line_to (cr, 0, -OSD_CROSSHAIR_TICK);
1525        cairo_move_to (cr, OSD_CROSSHAIR_W/2,
1526                       OSD_CROSSHAIR_H/2 + OSD_CROSSHAIR_RADIUS);
1527        cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);
1528    
1529        cairo_stroke (cr);
1530    }
1531    
1532    static void
1533    osd_render_crosshair(osm_gps_map_osd_t *osd)
1534    {
1535        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1536    
1537        if(!priv->crosshair.surface || priv->crosshair.rendered)
1538            return;
1539    
1540        priv->crosshair.rendered = TRUE;
1541    
1542        /* first fill with transparency */
1543        g_assert(priv->crosshair.surface);
1544        cairo_t *cr = cairo_create(priv->crosshair.surface);
1545        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1546        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
1547        cairo_paint(cr);
1548        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1549    
1550        cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
1551    
1552        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.5);
1553        cairo_set_line_width (cr, OSD_CROSSHAIR_RADIUS/2);
1554        osd_render_crosshair_shape(cr);
1555    
1556        cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
1557        cairo_set_line_width (cr, OSD_CROSSHAIR_RADIUS/4);
1558        osd_render_crosshair_shape(cr);
1559    
1560        cairo_destroy(cr);
1561    }
1562    #endif
1563    
1564    #ifdef OSD_SCALE
1565    
1566    #ifndef OSD_SCALE_FONT_SIZE
1567    #define OSD_SCALE_FONT_SIZE (12.0)
1568    #endif
1569    #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)
1570    #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)
1571    
1572  /* various parameters used to create the scale */  /* various parameters used to create the scale */
1573  #define OSD_SCALE_H2   (OSD_SCALE_H/2)  #define OSD_SCALE_H2   (OSD_SCALE_H/2)
1574  #define OSD_SCALE_TICK (2*OSD_SCALE_FONT_SIZE/3)  #define OSD_SCALE_TICK (2*OSD_SCALE_FONT_SIZE/3)
# Line 741  osd_render_scale(osm_gps_map_osd_t *osd) Line 1581  osd_render_scale(osm_gps_map_osd_t *osd)
1581  {  {
1582      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1583    
1584        if(!priv->scale.surface)
1585            return;
1586    
1587      /* this only needs to be rendered if the zoom has changed */      /* this only needs to be rendered if the zoom has changed */
1588      gint zoom;      gint zoom;
1589      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
1590      if(zoom == priv->scale_zoom)      if(zoom == priv->scale.zoom)
1591          return;          return;
1592    
1593      priv->scale_zoom = zoom;      priv->scale.zoom = zoom;
1594    
1595      float m_per_pix = osm_gps_map_get_scale(OSM_GPS_MAP(osd->widget));      float m_per_pix = osm_gps_map_get_scale(OSM_GPS_MAP(osd->widget));
1596    
1597      /* first fill with transparency */      /* first fill with transparency */
1598      cairo_t *cr = cairo_create(priv->scale);      g_assert(priv->scale.surface);
1599        cairo_t *cr = cairo_create(priv->scale.surface);
1600      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1601      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
1602      // pink for testing:    cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);      // pink for testing:    cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);
# Line 863  osd_render_scale(osm_gps_map_osd_t *osd) Line 1707  osd_render_scale(osm_gps_map_osd_t *osd)
1707    
1708      cairo_destroy(cr);      cairo_destroy(cr);
1709  }  }
1710    #endif
1711    
1712  static void  static void
1713  osd_render(osm_gps_map_osd_t *osd)  osd_render_controls(osm_gps_map_osd_t *osd)
1714  {  {
1715      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1716    
1717        if(!priv->controls.surface)
1718            return;
1719    
1720        if(priv->controls.rendered
1721    #ifdef OSD_GPS_BUTTON
1722           && (priv->controls.gps_enabled == (osd->cb != NULL))
1723    #endif
1724           )
1725            return;
1726    
1727    #ifdef OSD_GPS_BUTTON
1728        priv->controls.gps_enabled = (osd->cb != NULL);
1729    #endif
1730        priv->controls.rendered = TRUE;
1731    
1732  #ifndef OSD_COLOR  #ifndef OSD_COLOR
1733      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];
1734      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];
# Line 876  osd_render(osm_gps_map_osd_t *osd) Line 1736  osd_render(osm_gps_map_osd_t *osd)
1736  #endif  #endif
1737    
1738      /* first fill with transparency */      /* first fill with transparency */
1739      cairo_t *cr = cairo_create(priv->overlay);      g_assert(priv->controls.surface);
1740        cairo_t *cr = cairo_create(priv->controls.surface);
1741      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1742      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
1743      cairo_paint(cr);      cairo_paint(cr);
# Line 947  osd_render(osm_gps_map_osd_t *osd) Line 1808  osd_render(osm_gps_map_osd_t *osd)
1808      cairo_stroke(cr);      cairo_stroke(cr);
1809    
1810      cairo_destroy(cr);      cairo_destroy(cr);
1811    }
1812    
1813    static void
1814    osd_render(osm_gps_map_osd_t *osd)
1815    {
1816        /* this function is actually called pretty often since the */
1817        /* OSD contents may have changed (due to a coordinate/zoom change). */
1818        /* The different OSD parts have to make sure that they don't */
1819        /* render unneccessarily often and thus waste CPU power */
1820    
1821        osd_render_controls(osd);
1822    
1823  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1824      osd_render_source_sel(osd);      osd_render_source_sel(osd, FALSE);
1825  #endif  #endif
1826    
1827  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1828      osd_render_scale(osd);      osd_render_scale(osd);
1829  #endif  #endif
1830    
1831    #ifdef OSD_CROSSHAIR
1832        osd_render_crosshair(osd);
1833    #endif
1834    
1835    #ifdef OSD_NAV
1836        osd_render_nav(osd);
1837    #endif
1838    
1839    #ifdef OSD_COORDINATES
1840        osd_render_coordinates(osd);
1841    #endif
1842  }  }
1843    
1844  static void  static void
# Line 964  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1848  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1848    
1849      /* OSD itself uses some off-screen rendering, so check if the */      /* OSD itself uses some off-screen rendering, so check if the */
1850      /* offscreen buffer is present and create it if not */      /* offscreen buffer is present and create it if not */
1851      if(!priv->overlay) {      if(!priv->controls.surface) {
1852          /* create overlay ... */          /* create overlay ... */
1853          priv->overlay =          priv->controls.surface =
1854              cairo_image_surface_create(CAIRO_FORMAT_ARGB32, OSD_W+2, OSD_H+2);              cairo_image_surface_create(CAIRO_FORMAT_ARGB32, OSD_W+2, OSD_H+2);
1855    
1856            priv->controls.rendered = FALSE;
1857    #ifdef OSD_GPS_BUTTON
1858            priv->controls.gps_enabled = FALSE;
1859    #endif
1860    
1861  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1862          /* the initial OSD state is alway not-expanded */          /* the initial OSD state is alway not-expanded */
1863          priv->map_source =          priv->source_sel.surface =
1864              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1865                                             OSD_S_W+2, OSD_S_H+2);                                             OSD_S_W+2, OSD_S_H+2);
1866            priv->source_sel.rendered = FALSE;
1867  #endif  #endif
1868    
1869  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1870          priv->scale =          priv->scale.surface =
1871              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1872                                         OSD_SCALE_W, OSD_SCALE_H);                                         OSD_SCALE_W, OSD_SCALE_H);
1873          priv->scale_zoom = -1;          priv->scale.zoom = -1;
1874    #endif
1875    
1876    #ifdef OSD_CROSSHAIR
1877            priv->crosshair.surface =
1878                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1879                                           OSD_CROSSHAIR_W, OSD_CROSSHAIR_H);
1880            priv->crosshair.rendered = FALSE;
1881    #endif
1882    
1883    #ifdef OSD_COORDINATES
1884            priv->coordinates.surface =
1885                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1886                                           OSD_COORDINATES_W, OSD_COORDINATES_H);
1887    
1888            priv->coordinates.lat = priv->coordinates.lon = OSM_GPS_MAP_INVALID;
1889  #endif  #endif
1890    
1891          /* ... and render it */          /* ... and render it */
# Line 990  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1895  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1895      // now draw this onto the original context      // now draw this onto the original context
1896      cairo_t *cr = gdk_cairo_create(drawable);      cairo_t *cr = gdk_cairo_create(drawable);
1897    
1898      int x = OSD_X, y = OSD_Y;      gint x, y;
     if(OSD_X < 0)  
         x = osd->widget->allocation.width - OSD_W + OSD_X;  
1899    
1900      if(OSD_Y < 0)  #ifdef OSD_SCALE
1901          y = osd->widget->allocation.height - OSD_H + OSD_Y;      x =  OSD_X;
1902        y = -OSD_Y;
1903        if(x < 0) x += osd->widget->allocation.width - OSD_SCALE_W;
1904        if(y < 0) y += osd->widget->allocation.height - OSD_SCALE_H;
1905    
1906      cairo_set_source_surface(cr, priv->overlay, x, y);      cairo_set_source_surface(cr, priv->scale.surface, x, y);
1907        cairo_paint(cr);
1908    #endif
1909    
1910    #ifdef OSD_CROSSHAIR
1911        x = (osd->widget->allocation.width - OSD_CROSSHAIR_W)/2;
1912        y = (osd->widget->allocation.height - OSD_CROSSHAIR_H)/2;
1913    
1914        cairo_set_source_surface(cr, priv->crosshair.surface, x, y);
1915        cairo_paint(cr);
1916    #endif
1917    
1918    #ifdef OSD_NAV
1919        if(priv->nav.surface) {
1920            x =  OSD_X;
1921            if(x < 0) x += osd->widget->allocation.width - OSD_NAV_W;
1922            y = (osd->widget->allocation.height - OSD_NAV_H)/2;
1923    
1924            cairo_set_source_surface(cr, priv->nav.surface, x, y);
1925            cairo_paint(cr);
1926        }
1927    #endif
1928    
1929    #ifdef OSD_COORDINATES
1930        x = -OSD_X;
1931        y = -OSD_Y;
1932        if(x < 0) x += osd->widget->allocation.width - OSD_COORDINATES_W;
1933        if(y < 0) y += osd->widget->allocation.height - OSD_COORDINATES_H;
1934    
1935        cairo_set_source_surface(cr, priv->coordinates.surface, x, y);
1936        cairo_paint(cr);
1937    #endif
1938    
1939    #ifdef OSD_BALLOON
1940        if(priv->balloon.surface) {
1941    
1942            /* convert given lat lon into screen coordinates */
1943            gint x, y;
1944            osm_gps_map_geographic_to_screen (OSM_GPS_MAP(osd->widget),
1945                                          priv->balloon.lat, priv->balloon.lon,
1946                                          &x, &y);
1947    
1948            /* check if balloon needs to be rerendered */
1949            osd_render_balloon(osd);
1950    
1951            cairo_set_source_surface(cr, priv->balloon.surface,
1952                                     x + priv->balloon.offset_x,
1953                                     y + priv->balloon.offset_y);
1954            cairo_paint(cr);
1955        }
1956    #endif
1957    
1958        x = OSD_X;
1959        if(x < 0)
1960            x += osd->widget->allocation.width - OSD_W;
1961    
1962        y = OSD_Y;
1963        if(y < 0)
1964            y += osd->widget->allocation.height - OSD_H;
1965    
1966        cairo_set_source_surface(cr, priv->controls.surface, x, y);
1967      cairo_paint(cr);      cairo_paint(cr);
1968    
1969  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1970      if(!priv->handler_id) {      if(!priv->source_sel.handler_id) {
1971          /* the OSD source selection is not being animated */          /* the OSD source selection is not being animated */
1972          if(!priv->expanded)          if(!priv->source_sel.expanded)
1973              x = osd->widget->allocation.width - OSD_S_W;              x = osd->widget->allocation.width - OSD_S_W;
1974          else          else
1975              x = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;              x = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;
1976      } else      } else
1977          x = priv->shift;          x = priv->source_sel.shift;
1978    
1979      y = OSD_S_Y;      y = OSD_S_Y;
1980      if(OSD_S_Y < 0) {      if(OSD_S_Y < 0) {
1981          if(!priv->expanded)          if(!priv->source_sel.expanded)
1982              y = osd->widget->allocation.height - OSD_S_H + OSD_S_Y;              y = osd->widget->allocation.height - OSD_S_H + OSD_S_Y;
1983          else          else
1984              y = osd->widget->allocation.height - OSD_S_EXP_H + OSD_S_Y;              y = osd->widget->allocation.height - OSD_S_EXP_H + OSD_S_Y;
1985      }      }
1986    
1987      cairo_set_source_surface(cr, priv->map_source, x, y);      cairo_set_source_surface(cr, priv->source_sel.surface, x, y);
     cairo_paint(cr);  
 #endif  
   
 #ifdef OSD_SCALE  
     x =  OSD_X;  
     y = -OSD_Y;  
     if(x < 0) x += osd->widget->allocation.width - OSD_SCALE_W;  
     if(y < 0) y += osd->widget->allocation.height - OSD_SCALE_H;  
   
     cairo_set_source_surface(cr, priv->scale, x, y);  
1988      cairo_paint(cr);      cairo_paint(cr);
1989  #endif  #endif
1990    
# Line 1040  osd_free(osm_gps_map_osd_t *osd) Line 1996  osd_free(osm_gps_map_osd_t *osd)
1996  {  {
1997      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1998    
1999      if (priv->overlay)      if (priv->controls.surface)
2000           cairo_surface_destroy(priv->overlay);           cairo_surface_destroy(priv->controls.surface);
2001    
2002  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
2003      if(priv->handler_id)      if(priv->source_sel.handler_id)
2004          gtk_timeout_remove(priv->handler_id);          gtk_timeout_remove(priv->source_sel.handler_id);
2005    
2006      if (priv->map_source)      if (priv->source_sel.surface)
2007           cairo_surface_destroy(priv->map_source);           cairo_surface_destroy(priv->source_sel.surface);
2008  #endif  #endif
2009    
2010  #ifdef OSD_SCALE  #ifdef OSD_SCALE
2011      if (priv->scale)      if (priv->scale.surface)
2012           cairo_surface_destroy(priv->scale);           cairo_surface_destroy(priv->scale.surface);
2013    #endif
2014    
2015    #ifdef OSD_CROSSHAIR
2016        if (priv->crosshair.surface)
2017             cairo_surface_destroy(priv->crosshair.surface);
2018    #endif
2019    
2020    #ifdef OSD_NAV
2021        if (priv->nav.surface)
2022             cairo_surface_destroy(priv->nav.surface);
2023    #endif
2024    
2025    #ifdef OSD_COORDINATES
2026        if (priv->coordinates.surface)
2027             cairo_surface_destroy(priv->coordinates.surface);
2028  #endif  #endif
2029    
2030    #ifdef OSD_BALLOON
2031        if (priv->balloon.surface)
2032             cairo_surface_destroy(priv->balloon.surface);
2033    #endif
2034    
2035        printf("freeing priv\n");
2036      g_free(priv);      g_free(priv);
2037  }  }
2038    
# Line 1064  osd_busy(osm_gps_map_osd_t *osd) Line 2041  osd_busy(osm_gps_map_osd_t *osd)
2041  {  {
2042  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
2043      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
2044      return (priv->handler_id != 0);      return (priv->source_sel.handler_id != 0);
2045  #else  #else
2046      return FALSE;      return FALSE;
2047  #endif  #endif
2048  }  }
2049    
2050    static osd_button_t
2051    osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
2052        return osd_check_int(osd, TRUE, down, x, y);
2053    }
2054    
2055  static osm_gps_map_osd_t osd_classic = {  static osm_gps_map_osd_t osd_classic = {
2056      .widget     = NULL,      .widget     = NULL,
2057    
# Line 1089  static osm_gps_map_osd_t osd_classic = { Line 2071  static osm_gps_map_osd_t osd_classic = {
2071  void  void
2072  osm_gps_map_osd_classic_init(OsmGpsMap *map)  osm_gps_map_osd_classic_init(OsmGpsMap *map)
2073  {  {
2074      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);      osd_priv_t *priv = g_new0(osd_priv_t, 1);
2075        printf("alloc new osd priv\n");
2076    
2077      osd_classic.priv = priv;      /* reset entries to default value */
2078        osd_classic.widget = NULL;
2079        osd_classic.cb     = NULL;
2080        osd_classic.data   = NULL;
2081        osd_classic.priv   = priv;
2082    
2083    #ifdef OSD_BALLOON
2084        priv->balloon.lat = OSM_GPS_MAP_INVALID;
2085        priv->balloon.lon = OSM_GPS_MAP_INVALID;
2086    #endif
2087    
2088      osm_gps_map_register_osd(map, &osd_classic);      osm_gps_map_register_osd(map, &osd_classic);
2089  }  }
# Line 1120  osm_gps_map_osd_check(OsmGpsMap *map, gi Line 2112  osm_gps_map_osd_check(OsmGpsMap *map, gi
2112      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2113      g_return_val_if_fail (osd, OSD_NONE);      g_return_val_if_fail (osd, OSD_NONE);
2114    
2115      return osd_check(osd, x, y);      return osd_check_int(osd, FALSE, TRUE, x, y);
2116  }  }
Legend:
Removed from v.103  
changed lines
  Added in v.231