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

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

revision 94 by harbaum, Thu Sep 3 11:04:05 2009 UTC revision 114 by harbaum, Wed Sep 16 20:04:38 2009 UTC
# Line 32  Line 32 
32  #include <cairo.h>  #include <cairo.h>
33    
34  #include "osm-gps-map.h"  #include "osm-gps-map.h"
35    #include "converter.h"
36  #include "osm-gps-map-osd-classic.h"  #include "osm-gps-map-osd-classic.h"
37    
38  //the osd controls  //the osd controls
39  typedef struct {  typedef struct {
40      /* the offscreen representation of the OSD */      /* the offscreen representation of the OSD */
41      cairo_surface_t *overlay;      struct {
42            cairo_surface_t *surface;
43            gboolean rendered;
44    #ifdef OSD_GPS_BUTTON
45            gboolean gps_enabled;
46    #endif
47        } controls;
48    
49    #ifdef OSD_BALLOON
50        //a balloon with additional info
51        struct {
52            cairo_surface_t *surface;
53            int orientation, offset_x, offset_y;
54    
55            gboolean just_created;
56            float lat, lon;
57            OsmGpsMapRect_t rect;
58    
59            /* function called to have the user app draw the contents */
60            OsmGpsMapBalloonCallback cb;
61            gpointer data;
62        } balloon;
63    #endif
64    
65    #ifdef OSD_SCALE
66        struct {
67            cairo_surface_t *surface;
68            int zoom;
69        } scale;
70    #endif
71    
72    #ifdef OSD_CROSSHAIR
73        struct {
74            cairo_surface_t *surface;
75            gboolean rendered;
76        } crosshair;
77    #endif
78    
79    #ifdef OSD_COORDINATES
80        struct {
81            cairo_surface_t *surface;
82            float lat, lon;
83        } coordinates;
84    #endif
85    
86  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
87      /* values to handle the "source" menu */      struct {
88      cairo_surface_t *map_source;          /* values to handle the "source" menu */
89      gboolean expanded;          cairo_surface_t *surface;
90      gint shift, dir, count;          gboolean expanded;
91      gint handler_id;          gint shift, dir, count;
92      gint width, height;          gint handler_id;
93            gint width, height;
94            gboolean rendered;
95        } source_sel;
96  #endif  #endif
97    
98  } osd_priv_t;  } osd_priv_t;
99    
100    #ifdef OSD_BALLOON
101    /* most visual effects are hardcoded by now, but may be made */
102    /* available via properties later */
103    #ifndef BALLOON_AREA_WIDTH
104    #define BALLOON_AREA_WIDTH           290
105    #endif
106    #ifndef BALLOON_AREA_HEIGHT
107    #define BALLOON_AREA_HEIGHT           75
108    #endif
109    #ifndef BALLOON_CORNER_RADIUS
110    #define BALLOON_CORNER_RADIUS         10
111    #endif
112    
113    #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
114    #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
115    #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
116    #define BALLOON_TRANSPARENCY         0.8
117    #define POINTER_HEIGHT                20
118    #define POINTER_FOOT_WIDTH            20
119    #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
120    #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
121    #define BALLOON_SHADOW_TRANSPARENCY  0.2
122    
123    #define BALLOON_W  (BALLOON_WIDTH + BALLOON_SHADOW)
124    #define BALLOON_H  (BALLOON_HEIGHT + POINTER_HEIGHT + BALLOON_SHADOW)
125    
126    #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
127    
128    
129    /* draw the bubble shape. this is used twice, once for the shape and once */
130    /* for the shadow */
131    static void
132    osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
133           gboolean bottom, int px, int py, int px0, int px1) {
134    
135        cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
136        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
137                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
138        if(!bottom) {
139            /* insert top pointer */
140            cairo_line_to (cr, px1, y0);
141            cairo_line_to (cr, px, py);
142            cairo_line_to (cr, px0, y0);
143        }
144    
145        cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
146        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
147                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
148        cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
149        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
150                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
151        if(bottom) {
152            /* insert bottom pointer */
153            cairo_line_to (cr, px0, y1);
154            cairo_line_to (cr, px, py);
155            cairo_line_to (cr, px1, y1);
156        }
157    
158        cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
159        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
160                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
161    
162        cairo_close_path (cr);
163    }
164    
165    static void
166    osd_render_balloon(osm_gps_map_osd_t *osd) {
167        osd_priv_t *priv = (osd_priv_t*)osd->priv;
168    
169        /* get zoom */
170        gint zoom;
171        g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
172    
173        /* ------- convert given coordinate into screen position --------- */
174        gint xs, ys;
175        osm_gps_map_geographic_to_screen (OSM_GPS_MAP(osd->widget),
176                                          priv->balloon.lat, priv->balloon.lon,
177                                          &xs, &ys);
178    
179        gint x0 = 1, y0 = 1;
180    
181        /* check position of this relative to screen center to determine */
182        /* pointer direction ... */
183        int pointer_x, pointer_x0, pointer_x1;
184        int pointer_y;
185    
186        /* ... and calculate position */
187        int orientation = 0;
188        if(xs > osd->widget->allocation.width/2) {
189            priv->balloon.offset_x = -BALLOON_WIDTH + POINTER_OFFSET;
190            pointer_x = x0 - priv->balloon.offset_x;
191            pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
192            pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;
193            orientation |= 1;
194        } else {
195            priv->balloon.offset_x = -POINTER_OFFSET;
196            pointer_x = x0 - priv->balloon.offset_x;
197            pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
198            pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;
199        }
200    
201        gboolean bottom = FALSE;
202        if(ys > osd->widget->allocation.height/2) {
203            priv->balloon.offset_y = -BALLOON_HEIGHT - POINTER_HEIGHT;
204            pointer_y = y0 - priv->balloon.offset_y;
205            bottom = TRUE;
206            orientation |= 2;
207        } else {
208            priv->balloon.offset_y = 0;
209            pointer_y = y0 - priv->balloon.offset_y;
210            y0 += POINTER_HEIGHT;
211        }
212    
213        /* if required orientation equals current one, then don't render */
214        /* anything */
215        if(orientation == priv->balloon.orientation)
216            return;
217    
218        priv->balloon.orientation = orientation;
219    
220        /* calculate bottom/right of box */
221        int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
222    
223        /* save balloon screen coordinates for later use */
224        priv->balloon.rect.x = x0 + BALLOON_BORDER;
225        priv->balloon.rect.y = y0 + BALLOON_BORDER;
226        priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
227        priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
228    
229        cairo_t *cr = cairo_create(priv->balloon.surface);
230        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
231        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
232        cairo_paint(cr);
233        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
234    
235        /* --------- draw shadow --------------- */
236        osm_gps_map_draw_balloon_shape (cr,
237                     x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW,
238                     x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,
239                     bottom, pointer_x, pointer_y,
240                     pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);
241    
242        cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);
243        cairo_fill_preserve (cr);
244        cairo_set_source_rgba (cr, 1, 0, 0, 1.0);
245        cairo_set_line_width (cr, 0);
246        cairo_stroke (cr);
247    
248        /* --------- draw main shape ----------- */
249        osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,
250                     bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);
251    
252        cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);
253        cairo_fill_preserve (cr);
254        cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);
255        cairo_set_line_width (cr, 1);
256        cairo_stroke (cr);
257    
258        if (priv->balloon.cb) {
259            /* clip in case application tries to draw in */
260                /* exceed of the balloon */
261            cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
262                             priv->balloon.rect.w, priv->balloon.rect.h);
263            cairo_clip (cr);
264            cairo_new_path (cr);  /* current path is not
265                                     consumed by cairo_clip() */
266    
267            priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
268        }
269    
270        cairo_destroy(cr);
271    }
272    
273    /* return true if balloon is being displayed and if */
274    /* the given coordinate is within this balloon */
275    static gboolean
276    osd_balloon_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y)
277    {
278        osd_priv_t *priv = (osd_priv_t*)osd->priv;
279    
280        if(!priv->balloon.surface)
281            return FALSE;
282    
283        gint xs, ys;
284        osm_gps_map_geographic_to_screen (OSM_GPS_MAP(osd->widget),
285                                          priv->balloon.lat, priv->balloon.lon,
286                                          &xs, &ys);
287    
288        xs += priv->balloon.rect.x + priv->balloon.offset_x;
289        ys += priv->balloon.rect.y + priv->balloon.offset_y;
290    
291        /* handle the fact that the balloon may have been created by the */
292        /* button down event */
293    
294        gboolean is_in =
295            (x > xs) && (x < xs + priv->balloon.rect.w) &&
296            (y > ys) && (y < ys + priv->balloon.rect.h);
297    
298        if(!is_in && !down && !priv->balloon.just_created) {
299            /* the user actually clicked outside the balloon */
300    
301            /* close the balloon! */
302            osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));
303        }
304    
305        return is_in;
306    }
307    
308    void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {
309        g_return_if_fail (OSM_IS_GPS_MAP (map));
310    
311        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
312        g_return_if_fail (osd);
313    
314        osd_priv_t *priv = (osd_priv_t*)osd->priv;
315        g_return_if_fail (priv);
316    
317        if(priv->balloon.surface) {
318            cairo_surface_destroy(priv->balloon.surface);
319            priv->balloon.surface = NULL;
320            priv->balloon.lat = OSM_GPS_MAP_INVALID;
321            priv->balloon.lon = OSM_GPS_MAP_INVALID;
322        }
323        osm_gps_map_redraw(map);
324    }
325    
326    void
327    osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
328                                  OsmGpsMapBalloonCallback cb, gpointer data) {
329        g_return_if_fail (OSM_IS_GPS_MAP (map));
330    
331        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
332        g_return_if_fail (osd);
333    
334        osd_priv_t *priv = (osd_priv_t*)osd->priv;
335        g_return_if_fail (priv);
336    
337        osm_gps_map_osd_clear_balloon (map);
338    
339        /* allocate balloon surface */
340        priv->balloon.surface =
341            cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
342                                       BALLOON_W+2, BALLOON_H+2);
343    
344        priv->balloon.lat = latitude;
345        priv->balloon.lon = longitude;
346        priv->balloon.cb = cb;
347        priv->balloon.data = data;
348        priv->balloon.just_created = TRUE;
349    
350        priv->balloon.orientation = -1;
351    
352        osd_render_balloon(osd);
353    
354        osm_gps_map_redraw(map);
355    }
356    
357    #endif // OSD_BALLOON
358    
359  /* position and extent of bounding box */  /* position and extent of bounding box */
360  #ifndef OSD_X  #ifndef OSD_X
361  #define OSD_X      (10)  #define OSD_X      (10)
# Line 272  osd_check_zoom(gint x, gint y) { Line 578  osd_check_zoom(gint x, gint y) {
578  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)
579    
580  /* size of usable area when expanded */  /* size of usable area when expanded */
581  #define OSD_S_AREA_W (priv->width)  #define OSD_S_AREA_W (priv->source_sel.width)
582  #define OSD_S_AREA_H (priv->height)  #define OSD_S_AREA_H (priv->source_sel.height)
583  #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)
584  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)
585    
# Line 289  osd_check_zoom(gint x, gint y) { Line 595  osd_check_zoom(gint x, gint y) {
595  /* or the entire menu incl. the puller (expanded) */  /* or the entire menu incl. the puller (expanded) */
596  static void  static void
597  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) {
598      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
599          /* just draw the puller */          /* just draw the puller */
600          cairo_move_to (cr, x + OSD_S_PW, y + OSD_S_PH);          cairo_move_to (cr, x + OSD_S_PW, y + OSD_S_PH);
601          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 317  osd_source_content(osm_gps_map_osd_t *os Line 623  osd_source_content(osm_gps_map_osd_t *os
623    
624      int py = offset + OSD_S_RAD - OSD_S_D0;      int py = offset + OSD_S_RAD - OSD_S_D0;
625    
626      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
627          /* draw the "puller" open (<) arrow */          /* draw the "puller" open (<) arrow */
628          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);
629          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);
# Line 342  osd_source_content(osm_gps_map_osd_t *os Line 648  osd_source_content(osm_gps_map_osd_t *os
648                                      CAIRO_FONT_WEIGHT_BOLD);                                      CAIRO_FONT_WEIGHT_BOLD);
649              cairo_set_font_size (cr, OSD_FONT_SIZE);              cairo_set_font_size (cr, OSD_FONT_SIZE);
650    
651              int i, step = (priv->height - 2*OSD_TEXT_BORDER) /              int i, step = (priv->source_sel.height - 2*OSD_TEXT_BORDER) /
652                  OSM_GPS_MAP_SOURCE_LAST;                  OSM_GPS_MAP_SOURCE_LAST;
653              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++) {
654                  cairo_text_extents_t extents;                  cairo_text_extents_t extents;
# Line 356  osd_source_content(osm_gps_map_osd_t *os Line 662  osd_source_content(osm_gps_map_osd_t *os
662                  if(source == i) {                  if(source == i) {
663                      cairo_rectangle(cr, x - OSD_TEXT_BORDER/2,                      cairo_rectangle(cr, x - OSD_TEXT_BORDER/2,
664                                      y - OSD_TEXT_SKIP,                                      y - OSD_TEXT_SKIP,
665                                      priv->width - OSD_TEXT_BORDER,                                      priv->source_sel.width - OSD_TEXT_BORDER,
666                                      step + OSD_TEXT_SKIP);                                      step + OSD_TEXT_SKIP);
667                      cairo_fill(cr);                      cairo_fill(cr);
668    
# Line 387  osd_source_content(osm_gps_map_osd_t *os Line 693  osd_source_content(osm_gps_map_osd_t *os
693  }  }
694    
695  static void  static void
696  osd_render_source_sel(osm_gps_map_osd_t *osd) {  osd_render_source_sel(osm_gps_map_osd_t *osd, gboolean force_rerender) {
697      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
698    
699        if(priv->source_sel.rendered && !force_rerender)
700            return;
701    
702        priv->source_sel.rendered = TRUE;
703    
704  #ifndef OSD_COLOR  #ifndef OSD_COLOR
705      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];
706      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];
# Line 397  osd_render_source_sel(osm_gps_map_osd_t Line 708  osd_render_source_sel(osm_gps_map_osd_t
708  #endif  #endif
709    
710      /* draw source selector */      /* draw source selector */
711      cairo_t *cr = cairo_create(priv->map_source);      cairo_t *cr = cairo_create(priv->source_sel.surface);
712      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
713      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);
714      cairo_paint(cr);      cairo_paint(cr);
# Line 438  osd_source_reallocate(osm_gps_map_osd_t Line 749  osd_source_reallocate(osm_gps_map_osd_t
749      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
750    
751      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
752      g_assert (priv->map_source);      g_assert (priv->source_sel.surface);
753    
754      int w = OSD_S_W, h = OSD_S_H;      int w = OSD_S_W, h = OSD_S_H;
755      if(priv->expanded) {      if(priv->source_sel.expanded) {
         /* ... and right of it the waypoint id */  
756          cairo_text_extents_t extents;          cairo_text_extents_t extents;
757    
758          /* determine content size */          /* determine content size */
759          cairo_t *cr = cairo_create(priv->map_source);          cairo_t *cr = cairo_create(priv->source_sel.surface);
760          cairo_select_font_face (cr, "Sans",          cairo_select_font_face (cr, "Sans",
761                                  CAIRO_FONT_SLANT_NORMAL,                                  CAIRO_FONT_SLANT_NORMAL,
762                                  CAIRO_FONT_WEIGHT_BOLD);                                  CAIRO_FONT_WEIGHT_BOLD);
# Line 463  osd_source_reallocate(osm_gps_map_osd_t Line 773  osd_source_reallocate(osm_gps_map_osd_t
773          }          }
774          cairo_destroy(cr);          cairo_destroy(cr);
775    
776          priv->width  = max_w + 2*OSD_TEXT_BORDER;          priv->source_sel.width  = max_w + 2*OSD_TEXT_BORDER;
777          priv->height = OSM_GPS_MAP_SOURCE_LAST *          priv->source_sel.height = OSM_GPS_MAP_SOURCE_LAST *
778              (max_h + 2*OSD_TEXT_SKIP) + 2*OSD_TEXT_BORDER;              (max_h + 2*OSD_TEXT_SKIP) + 2*OSD_TEXT_BORDER;
779    
780          w = OSD_S_EXP_W;          w = OSD_S_EXP_W;
781          h = OSD_S_EXP_H;          h = OSD_S_EXP_H;
782      }      }
783    
784      cairo_surface_destroy(priv->map_source);      cairo_surface_destroy(priv->source_sel.surface);
785      priv->map_source =      priv->source_sel.surface =
786          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
787    
788      osd_render_source_sel(osd);      osd_render_source_sel(osd, TRUE);
   
789  }  }
790    
791  #define OSD_HZ      15  #define OSD_HZ      15
# Line 487  static gboolean osd_source_animate(gpoin Line 796  static gboolean osd_source_animate(gpoin
796      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
797      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;
798      gboolean done = FALSE;      gboolean done = FALSE;
799      priv->count += priv->dir;      priv->source_sel.count += priv->source_sel.dir;
800    
801      /* shifting in */      /* shifting in */
802      if(priv->dir < 0) {      if(priv->source_sel.dir < 0) {
803          if(priv->count <= 0) {          if(priv->source_sel.count <= 0) {
804              priv->count = 0;              priv->source_sel.count = 0;
805              done = TRUE;              done = TRUE;
806          }          }
807      } else {      } else {
808          if(priv->count >= 1000) {          if(priv->source_sel.count >= 1000) {
809              priv->expanded = FALSE;              priv->source_sel.expanded = FALSE;
810              osd_source_reallocate(osd);              osd_source_reallocate(osd);
811    
812              priv->count = 1000;              priv->source_sel.count = 1000;
813              done = TRUE;              done = TRUE;
814          }          }
815      }      }
# Line 508  static gboolean osd_source_animate(gpoin Line 817  static gboolean osd_source_animate(gpoin
817    
818      /* 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 */
819    
820      /* nicer sinoid mapping */      /* nice sinoid mapping */
821      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;
822      priv->shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +      priv->source_sel.shift =
823            (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +
824          m * diff;          m * diff;
825    
826        /* make sure the screen is updated */
827      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
828    
829        /* stop animation if done */
830      if(done)      if(done)
831          priv->handler_id = 0;          priv->source_sel.handler_id = 0;
832    
833      return !done;      return !done;
834  }  }
# Line 528  osd_source_toggle(osm_gps_map_osd_t *osd Line 840  osd_source_toggle(osm_gps_map_osd_t *osd
840      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
841    
842      /* ignore clicks while animation is running */      /* ignore clicks while animation is running */
843      if(priv->handler_id)      if(priv->source_sel.handler_id)
844          return;          return;
845    
846      /* expand immediately, collapse is handle at the end of the collapse animation */      /* expand immediately, collapse is handle at the end of the */
847      if(!priv->expanded) {      /* collapse animation */
848          priv->expanded = TRUE;      if(!priv->source_sel.expanded) {
849            priv->source_sel.expanded = TRUE;
850          osd_source_reallocate(osd);          osd_source_reallocate(osd);
851    
852          priv->count = 1000;          priv->source_sel.count = 1000;
853          priv->shift = osd->widget->allocation.width - OSD_S_W;          priv->source_sel.shift = osd->widget->allocation.width - OSD_S_W;
854          priv->dir = -1000/OSD_HZ;          priv->source_sel.dir = -1000/OSD_HZ;
855      } else {      } else {
856          priv->count =  0;          priv->source_sel.count =  0;
857          priv->shift = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;          priv->source_sel.shift = osd->widget->allocation.width -
858          priv->dir = +1000/OSD_HZ;              OSD_S_EXP_W + OSD_S_X;
859            priv->source_sel.dir = +1000/OSD_HZ;
860      }      }
861    
862      priv->handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ, osd_source_animate, osd);      /* start timer to handle animation */
863        priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,
864                                                      osd_source_animate, osd);
865  }  }
866    
867  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
868  static osd_button_t  static osd_button_t
869  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) {
870      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
871    
872      if(!priv->expanded)      if(!priv->source_sel.expanded)
873          x -= osd->widget->allocation.width - OSD_S_W;          x -= osd->widget->allocation.width - OSD_S_W;
874      else      else
875          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 568  osd_source_check(osm_gps_map_osd_t *osd, Line 884  osd_source_check(osm_gps_map_osd_t *osd,
884          /* really within puller shape? */          /* really within puller shape? */
885          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)) {
886              /* expand source selector */              /* expand source selector */
887              osd_source_toggle(osd);              if(down)
888                    osd_source_toggle(osd);
889    
890              /* tell upper layers that user clicked some background element */              /* tell upper layers that user clicked some background element */
891              /* of the OSD */              /* of the OSD */
# Line 577  osd_source_check(osm_gps_map_osd_t *osd, Line 894  osd_source_check(osm_gps_map_osd_t *osd,
894      }      }
895    
896      /* check for clicks into data area */      /* check for clicks into data area */
897      if(priv->expanded && !priv->handler_id) {      if(priv->source_sel.expanded && !priv->source_sel.handler_id) {
898          /* re-adjust from puller top to content top */          /* re-adjust from puller top to content top */
899          if(OSD_S_Y < 0)          if(OSD_S_Y < 0)
900              y += OSD_S_EXP_H - OSD_S_PH;              y += OSD_S_EXP_H - OSD_S_PH;
# Line 587  osd_source_check(osm_gps_map_osd_t *osd, Line 904  osd_source_check(osm_gps_map_osd_t *osd,
904             y > 0 &&             y > 0 &&
905             y < OSD_S_EXP_H) {             y < OSD_S_EXP_H) {
906    
907              int step = (priv->height - 2*OSD_TEXT_BORDER)              int step = (priv->source_sel.height - 2*OSD_TEXT_BORDER)
908                  / OSM_GPS_MAP_SOURCE_LAST;                  / OSM_GPS_MAP_SOURCE_LAST;
909    
910              y -= OSD_TEXT_BORDER - OSD_TEXT_SKIP;              y -= OSD_TEXT_BORDER - OSD_TEXT_SKIP;
911              y /= step;              y /= step;
912              y += 1;              y += 1;
913    
914              gint old = 0;              if(down) {
915              g_object_get(osd->widget, "map-source", &old, NULL);                  gint old = 0;
916                    g_object_get(osd->widget, "map-source", &old, NULL);
917              if(y > OSM_GPS_MAP_SOURCE_NULL &&  
918                 y <= OSM_GPS_MAP_SOURCE_LAST &&                  if(y > OSM_GPS_MAP_SOURCE_NULL &&
919                 old != y) {                     y <= OSM_GPS_MAP_SOURCE_LAST &&
920                  g_object_set(osd->widget, "map-source", y, NULL);                     old != y) {
921                        g_object_set(osd->widget, "map-source", y, NULL);
922                  osd_render_source_sel(osd);  
923                  osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));                      osd_render_source_sel(osd, TRUE);
924                        osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
925                    }
926              }              }
927    
928              /* return "clicked in OSD background" to prevent further */              /* return "clicked in OSD background" to prevent further */
# Line 617  osd_source_check(osm_gps_map_osd_t *osd, Line 936  osd_source_check(osm_gps_map_osd_t *osd,
936  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
937    
938  static osd_button_t  static osd_button_t
939  osd_check(osm_gps_map_osd_t *osd, gint x, gint y) {  osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
940      osd_button_t but = OSD_NONE;      osd_button_t but = OSD_NONE;
941    
942    #ifdef OSD_BALLOON
943        if(down) {
944            /* needed to handle balloons that are created at click */
945            osd_priv_t *priv = (osd_priv_t*)osd->priv;
946            priv->balloon.just_created = FALSE;
947        }
948    #endif
949    
950  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
951      /* the source selection area is handles internally */      /* the source selection area is handles internally */
952      but = osd_source_check(osd, x, y);      but = osd_source_check(osd, down, x, y);
     if(but != OSD_NONE)  
         return but;  
953  #endif  #endif
954    
955      x -= OSD_X;      if(but == OSD_NONE) {
956      y -= OSD_Y;          x -= OSD_X;
957            y -= OSD_Y;
958      if(OSD_X < 0)  
959          x -= (osd->widget->allocation.width - OSD_W);          if(OSD_X < 0)
960                x -= (osd->widget->allocation.width - OSD_W);
961      if(OSD_Y < 0)  
962          y -= (osd->widget->allocation.height - OSD_H);          if(OSD_Y < 0)
963                y -= (osd->widget->allocation.height - OSD_H);
964      /* first do a rough test for the OSD area. */  
965      /* this is just to avoid an unnecessary detailed test */          /* first do a rough test for the OSD area. */
966      if(x > 0 && x < OSD_W && y > 0 && y < OSD_H) {          /* this is just to avoid an unnecessary detailed test */
967            if(x > 0 && x < OSD_W && y > 0 && y < OSD_H) {
968  #ifndef OSD_NO_DPAD  #ifndef OSD_NO_DPAD
969          but = osd_check_dpad(x, y);              but = osd_check_dpad(x, y);
970  #endif  #endif
971            }
972    
973          if(but == OSD_NONE)          if(but == OSD_NONE)
974              but = osd_check_zoom(x, y);              but = osd_check_zoom(x, y);
975      }      }
976    
977    #ifdef OSD_BALLOON
978        if(but == OSD_NONE) {
979            /* check if user clicked into balloon */
980            if(osd_balloon_check(osd, down, x, y))
981                but = OSD_BG;
982        }
983    #endif
984    
985      return but;      return but;
986  }  }
987    
# Line 720  osd_zoom_labels(cairo_t *cr, gint x, gin Line 1055  osd_zoom_labels(cairo_t *cr, gint x, gin
1055      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);
1056  }  }
1057    
1058    #ifdef OSD_COORDINATES
1059    
1060    #ifndef OSD_COORDINATES_FONT_SIZE
1061    #define OSD_COORDINATES_FONT_SIZE 12
1062    #endif
1063    
1064    #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
1065    
1066    #define OSD_COORDINATES_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)
1067    #define OSD_COORDINATES_H  (2*OSD_COORDINATES_FONT_SIZE+OSD_COORDINATES_OFFSET)
1068    
1069    /* these can be overwritten with versions that support */
1070    /* localization */
1071    #ifndef OSD_COORDINATES_CHR_N
1072    #define OSD_COORDINATES_CHR_N  "N"
1073    #endif
1074    #ifndef OSD_COORDINATES_CHR_S
1075    #define OSD_COORDINATES_CHR_S  "S"
1076    #endif
1077    #ifndef OSD_COORDINATES_CHR_E
1078    #define OSD_COORDINATES_CHR_E  "E"
1079    #endif
1080    #ifndef OSD_COORDINATES_CHR_W
1081    #define OSD_COORDINATES_CHR_W  "W"
1082    #endif
1083    
1084    
1085    
1086    /* this is the classic geocaching notation */
1087    static char
1088    *osd_latitude_str(float latitude) {
1089        char *c = OSD_COORDINATES_CHR_N;
1090        float integral, fractional;
1091    
1092        if(isnan(latitude))
1093            return NULL;
1094    
1095        if(latitude < 0) {
1096            latitude = fabs(latitude);
1097            c = OSD_COORDINATES_CHR_S;
1098        }
1099    
1100        fractional = modff(latitude, &integral);
1101    
1102        return g_strdup_printf("%s %02d° %06.3f'",
1103                               c, (int)integral, fractional*60.0);
1104    }
1105    
1106    static char
1107    *osd_longitude_str(float longitude) {
1108        char *c = OSD_COORDINATES_CHR_E;
1109        float integral, fractional;
1110    
1111        if(isnan(longitude))
1112            return NULL;
1113    
1114        if(longitude < 0) {
1115            longitude = fabs(longitude);
1116            c = OSD_COORDINATES_CHR_W;
1117        }
1118    
1119        fractional = modff(longitude, &integral);
1120    
1121        return g_strdup_printf("%s %03d° %06.3f'",
1122                               c, (int)integral, fractional*60.0);
1123    }
1124    
1125  static void  static void
1126  osd_render(osm_gps_map_osd_t *osd) {  osd_render_coordinates(osm_gps_map_osd_t *osd)
1127    {
1128      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1129    
1130        /* get current map position */
1131        gfloat lat, lon;
1132        g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
1133    
1134        /* check if position has changed enough to require redraw */
1135        if(!isnan(priv->coordinates.lat) && !isnan(priv->coordinates.lon))
1136            /* 1/60000 == 1/1000 minute */
1137            if((fabsf(lat - priv->coordinates.lat) < 1/60000) &&
1138               (fabsf(lon - priv->coordinates.lon) < 1/60000))
1139                return;
1140    
1141        priv->coordinates.lat = lat;
1142        priv->coordinates.lon = lon;
1143    
1144        /* first fill with transparency */
1145        cairo_t *cr = cairo_create(priv->coordinates.surface);
1146        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1147        //    cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.5);
1148        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
1149        cairo_paint(cr);
1150        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1151    
1152        cairo_select_font_face (cr, "Sans",
1153                                CAIRO_FONT_SLANT_NORMAL,
1154                                CAIRO_FONT_WEIGHT_BOLD);
1155        cairo_set_font_size (cr, OSD_COORDINATES_FONT_SIZE);
1156    
1157        char *latitude = osd_latitude_str(lat);
1158        char *longitude = osd_longitude_str(lon);
1159    
1160        cairo_text_extents_t lat_extents, lon_extents;
1161        cairo_text_extents (cr, latitude, &lat_extents);
1162        cairo_text_extents (cr, longitude, &lon_extents);
1163    
1164        cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
1165        cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);
1166        cairo_move_to (cr,
1167                       (OSD_COORDINATES_W - lat_extents.width)/2,
1168                       OSD_COORDINATES_OFFSET - lat_extents.y_bearing);
1169        cairo_text_path (cr, latitude);
1170        cairo_move_to (cr,
1171                       (OSD_COORDINATES_W - lon_extents.width)/2,
1172                       OSD_COORDINATES_OFFSET - lon_extents.y_bearing +
1173                       OSD_COORDINATES_FONT_SIZE);
1174        cairo_text_path (cr, longitude);
1175        cairo_stroke (cr);
1176    
1177        cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
1178        cairo_move_to (cr,
1179                       (OSD_COORDINATES_W - lat_extents.width)/2,
1180                       OSD_COORDINATES_OFFSET - lat_extents.y_bearing);
1181        cairo_show_text (cr, latitude);
1182        cairo_move_to (cr,
1183                       (OSD_COORDINATES_W - lon_extents.width)/2,
1184                       OSD_COORDINATES_OFFSET - lon_extents.y_bearing +
1185                       OSD_COORDINATES_FONT_SIZE);
1186        cairo_show_text (cr, longitude);
1187    
1188        g_free(latitude);
1189        g_free(longitude);
1190    
1191        cairo_destroy(cr);
1192    }
1193    #endif  // OSD_COORDINATES
1194    
1195    #ifdef OSD_CROSSHAIR
1196    
1197    #ifndef OSD_CROSSHAIR_RADIUS
1198    #define OSD_CROSSHAIR_RADIUS 10
1199    #endif
1200    
1201    #define OSD_CROSSHAIR_TICK  (OSD_CROSSHAIR_RADIUS/2)
1202    #define OSD_CROSSHAIR_BORDER (OSD_CROSSHAIR_TICK + OSD_CROSSHAIR_RADIUS/4)
1203    #define OSD_CROSSHAIR_W  ((OSD_CROSSHAIR_RADIUS+OSD_CROSSHAIR_BORDER)*2)
1204    #define OSD_CROSSHAIR_H  ((OSD_CROSSHAIR_RADIUS+OSD_CROSSHAIR_BORDER)*2)
1205    
1206    static void
1207    osd_render_crosshair_shape(cairo_t *cr) {
1208        cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,
1209                   OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);
1210    
1211        cairo_move_to (cr, OSD_CROSSHAIR_W/2 - OSD_CROSSHAIR_RADIUS,
1212                       OSD_CROSSHAIR_H/2);
1213        cairo_rel_line_to (cr, -OSD_CROSSHAIR_TICK, 0);
1214        cairo_move_to (cr, OSD_CROSSHAIR_W/2 + OSD_CROSSHAIR_RADIUS,
1215                       OSD_CROSSHAIR_H/2);
1216        cairo_rel_line_to (cr,  OSD_CROSSHAIR_TICK, 0);
1217    
1218        cairo_move_to (cr, OSD_CROSSHAIR_W/2,
1219                       OSD_CROSSHAIR_H/2 - OSD_CROSSHAIR_RADIUS);
1220        cairo_rel_line_to (cr, 0, -OSD_CROSSHAIR_TICK);
1221        cairo_move_to (cr, OSD_CROSSHAIR_W/2,
1222                       OSD_CROSSHAIR_H/2 + OSD_CROSSHAIR_RADIUS);
1223        cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);
1224    
1225        cairo_stroke (cr);
1226    }
1227    
1228    static void
1229    osd_render_crosshair(osm_gps_map_osd_t *osd)
1230    {
1231        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1232    
1233        if(priv->crosshair.rendered)
1234            return;
1235    
1236        priv->crosshair.rendered = TRUE;
1237    
1238        /* first fill with transparency */
1239        cairo_t *cr = cairo_create(priv->crosshair.surface);
1240        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1241        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
1242        cairo_paint(cr);
1243        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1244    
1245        cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
1246    
1247        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.5);
1248        cairo_set_line_width (cr, OSD_CROSSHAIR_RADIUS/2);
1249        osd_render_crosshair_shape(cr);
1250    
1251        cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
1252        cairo_set_line_width (cr, OSD_CROSSHAIR_RADIUS/4);
1253        osd_render_crosshair_shape(cr);
1254    
1255        cairo_destroy(cr);
1256    }
1257    #endif
1258    
1259    #ifdef OSD_SCALE
1260    
1261    #ifndef OSD_SCALE_FONT_SIZE
1262    #define OSD_SCALE_FONT_SIZE 12
1263    #endif
1264    #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)
1265    #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)
1266    
1267    /* various parameters used to create the scale */
1268    #define OSD_SCALE_H2   (OSD_SCALE_H/2)
1269    #define OSD_SCALE_TICK (2*OSD_SCALE_FONT_SIZE/3)
1270    #define OSD_SCALE_M    (OSD_SCALE_H2 - OSD_SCALE_TICK)
1271    #define OSD_SCALE_I    (OSD_SCALE_H2 + OSD_SCALE_TICK)
1272    #define OSD_SCALE_FD   (OSD_SCALE_FONT_SIZE/4)
1273    
1274    static void
1275    osd_render_scale(osm_gps_map_osd_t *osd)
1276    {
1277        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1278    
1279        /* this only needs to be rendered if the zoom has changed */
1280        gint zoom;
1281        g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
1282        if(zoom == priv->scale.zoom)
1283            return;
1284    
1285        priv->scale.zoom = zoom;
1286    
1287        float m_per_pix = osm_gps_map_get_scale(OSM_GPS_MAP(osd->widget));
1288    
1289        /* first fill with transparency */
1290        cairo_t *cr = cairo_create(priv->scale.surface);
1291        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1292        cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
1293        // pink for testing:    cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);
1294        cairo_paint(cr);
1295        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1296    
1297        /* determine the size of the scale width in meters */
1298        float width = (OSD_SCALE_W-OSD_SCALE_FONT_SIZE/6) * m_per_pix;
1299    
1300        /* scale this to useful values */
1301        int exp = logf(width)*M_LOG10E;
1302        int mant = width/pow(10,exp);
1303        int width_metric = mant * pow(10,exp);
1304        char *dist_str = NULL;
1305        if(width_metric<1000)
1306            dist_str = g_strdup_printf("%u m", width_metric);
1307        else
1308            dist_str = g_strdup_printf("%u km", width_metric/1000);
1309        width_metric /= m_per_pix;
1310    
1311        /* and now the hard part: scale for useful imperial values :-( */
1312        /* try to convert to feet, 1ft == 0.3048 m */
1313        width /= 0.3048;
1314        float imp_scale = 0.3048;
1315        char *dist_imp_unit = "ft";
1316    
1317        if(width >= 100) {
1318            /* 1yd == 3 feet */
1319            width /= 3.0;
1320            imp_scale *= 3.0;
1321            dist_imp_unit = "yd";
1322    
1323            if(width >= 1760.0) {
1324                /* 1mi == 1760 yd */
1325                width /= 1760.0;
1326                imp_scale *= 1760.0;
1327                dist_imp_unit = "mi";
1328            }
1329        }
1330    
1331        /* also convert this to full tens/hundreds */
1332        exp = logf(width)*M_LOG10E;
1333        mant = width/pow(10,exp);
1334        int width_imp = mant * pow(10,exp);
1335        char *dist_str_imp = g_strdup_printf("%u %s", width_imp, dist_imp_unit);
1336    
1337        /* convert back to pixels */
1338        width_imp *= imp_scale;
1339        width_imp /= m_per_pix;
1340    
1341        cairo_select_font_face (cr, "Sans",
1342                                CAIRO_FONT_SLANT_NORMAL,
1343                                CAIRO_FONT_WEIGHT_BOLD);
1344        cairo_set_font_size (cr, OSD_SCALE_FONT_SIZE);
1345        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 1.0);
1346    
1347        cairo_text_extents_t extents;
1348        cairo_text_extents (cr, dist_str, &extents);
1349    
1350        cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
1351        cairo_set_line_width (cr, OSD_SCALE_FONT_SIZE/6);
1352        cairo_move_to (cr, 2*OSD_SCALE_FD, OSD_SCALE_H2-OSD_SCALE_FD);
1353        cairo_text_path (cr, dist_str);
1354        cairo_stroke (cr);
1355        cairo_move_to (cr, 2*OSD_SCALE_FD,
1356                       OSD_SCALE_H2+OSD_SCALE_FD + extents.height);
1357        cairo_text_path (cr, dist_str_imp);
1358        cairo_stroke (cr);
1359    
1360        cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
1361        cairo_move_to (cr, 2*OSD_SCALE_FD, OSD_SCALE_H2-OSD_SCALE_FD);
1362        cairo_show_text (cr, dist_str);
1363        cairo_move_to (cr, 2*OSD_SCALE_FD,
1364                       OSD_SCALE_H2+OSD_SCALE_FD + extents.height);
1365        cairo_show_text (cr, dist_str_imp);
1366    
1367        g_free(dist_str);
1368        g_free(dist_str_imp);
1369    
1370        /* draw white line */
1371        cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
1372        cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 1.0);
1373        cairo_set_line_width (cr, OSD_SCALE_FONT_SIZE/3);
1374        cairo_move_to (cr, OSD_SCALE_FONT_SIZE/6, OSD_SCALE_M);
1375        cairo_rel_line_to (cr, 0,  OSD_SCALE_TICK);
1376        cairo_rel_line_to (cr, width_metric, 0);
1377        cairo_rel_line_to (cr, 0, -OSD_SCALE_TICK);
1378        cairo_stroke(cr);
1379        cairo_move_to (cr, OSD_SCALE_FONT_SIZE/6, OSD_SCALE_I);
1380        cairo_rel_line_to (cr, 0, -OSD_SCALE_TICK);
1381        cairo_rel_line_to (cr, width_imp, 0);
1382        cairo_rel_line_to (cr, 0, +OSD_SCALE_TICK);
1383        cairo_stroke(cr);
1384    
1385        /* draw black line */
1386        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 1.0);
1387        cairo_set_line_width (cr, OSD_SCALE_FONT_SIZE/6);
1388        cairo_move_to (cr, OSD_SCALE_FONT_SIZE/6, OSD_SCALE_M);
1389        cairo_rel_line_to (cr, 0,  OSD_SCALE_TICK);
1390        cairo_rel_line_to (cr, width_metric, 0);
1391        cairo_rel_line_to (cr, 0, -OSD_SCALE_TICK);
1392        cairo_stroke(cr);
1393        cairo_move_to (cr, OSD_SCALE_FONT_SIZE/6, OSD_SCALE_I);
1394        cairo_rel_line_to (cr, 0, -OSD_SCALE_TICK);
1395        cairo_rel_line_to (cr, width_imp, 0);
1396        cairo_rel_line_to (cr, 0, +OSD_SCALE_TICK);
1397        cairo_stroke(cr);
1398    
1399        cairo_destroy(cr);
1400    }
1401    #endif
1402    
1403    static void
1404    osd_render_controls(osm_gps_map_osd_t *osd)
1405    {
1406        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1407    
1408        if(priv->controls.rendered
1409    #ifdef OSD_GPS_BUTTON
1410           && (priv->controls.gps_enabled == (osd->cb != NULL))
1411    #endif
1412           )
1413            return;
1414    
1415    #ifdef OSD_GPS_BUTTON
1416        priv->controls.gps_enabled = (osd->cb != NULL);
1417    #endif
1418        priv->controls.rendered = TRUE;
1419    
1420  #ifndef OSD_COLOR  #ifndef OSD_COLOR
1421      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];
1422      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];
# Line 731  osd_render(osm_gps_map_osd_t *osd) { Line 1424  osd_render(osm_gps_map_osd_t *osd) {
1424  #endif  #endif
1425    
1426      /* first fill with transparency */      /* first fill with transparency */
1427      cairo_t *cr = cairo_create(priv->overlay);      cairo_t *cr = cairo_create(priv->controls.surface);
1428      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1429      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);
1430      cairo_paint(cr);      cairo_paint(cr);
# Line 802  osd_render(osm_gps_map_osd_t *osd) { Line 1495  osd_render(osm_gps_map_osd_t *osd) {
1495      cairo_stroke(cr);      cairo_stroke(cr);
1496    
1497      cairo_destroy(cr);      cairo_destroy(cr);
1498    }
1499    
1500    static void
1501    osd_render(osm_gps_map_osd_t *osd)
1502    {
1503        /* this function is actually called pretty often since the */
1504        /* OSD contents may have changed (due to a coordinate/zoom change). */
1505        /* The different OSD parts have to make sure that they don't */
1506        /* render unneccessarily often and thus waste CPU power */
1507    
1508        osd_render_controls(osd);
1509    
1510  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1511      osd_render_source_sel(osd);      osd_render_source_sel(osd, FALSE);
1512    #endif
1513    
1514    #ifdef OSD_SCALE
1515        osd_render_scale(osd);
1516    #endif
1517    
1518    #ifdef OSD_CROSSHAIR
1519        osd_render_crosshair(osd);
1520    #endif
1521    
1522    #ifdef OSD_COORDINATES
1523        osd_render_coordinates(osd);
1524  #endif  #endif
1525  }  }
1526    
# Line 815  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1531  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1531    
1532      /* OSD itself uses some off-screen rendering, so check if the */      /* OSD itself uses some off-screen rendering, so check if the */
1533      /* offscreen buffer is present and create it if not */      /* offscreen buffer is present and create it if not */
1534      if(!priv->overlay) {      if(!priv->controls.surface) {
1535          /* create overlay ... */          /* create overlay ... */
1536          priv->overlay =          priv->controls.surface =
1537              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);
1538    
1539            priv->controls.rendered = FALSE;
1540    #ifdef OSD_GPS_BUTTON
1541            priv->controls.gps_enabled = FALSE;
1542    #endif
1543    
1544  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1545          /* the initial OSD state is alway not-expanded */          /* the initial OSD state is alway not-expanded */
1546          priv->map_source =          priv->source_sel.surface =
1547              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1548                                             OSD_S_W+2, OSD_S_H+2);                                             OSD_S_W+2, OSD_S_H+2);
1549            priv->source_sel.rendered = FALSE;
1550    #endif
1551    
1552    #ifdef OSD_SCALE
1553            priv->scale.surface =
1554                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1555                                           OSD_SCALE_W, OSD_SCALE_H);
1556            priv->scale.zoom = -1;
1557    #endif
1558    
1559    #ifdef OSD_CROSSHAIR
1560            priv->crosshair.surface =
1561                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1562                                           OSD_CROSSHAIR_W, OSD_CROSSHAIR_H);
1563            priv->crosshair.rendered = FALSE;
1564    #endif
1565    
1566    #ifdef OSD_COORDINATES
1567            priv->coordinates.surface =
1568                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1569                                           OSD_COORDINATES_W, OSD_COORDINATES_H);
1570    
1571            priv->coordinates.lat = priv->coordinates.lon = OSM_GPS_MAP_INVALID;
1572  #endif  #endif
1573    
1574          /* ... and render it */          /* ... and render it */
# Line 834  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1578  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1578      // now draw this onto the original context      // now draw this onto the original context
1579      cairo_t *cr = gdk_cairo_create(drawable);      cairo_t *cr = gdk_cairo_create(drawable);
1580    
1581      int x = OSD_X, y = OSD_Y;      gint x, y;
     if(OSD_X < 0)  
         x = osd->widget->allocation.width - OSD_W + OSD_X;  
1582    
1583      if(OSD_Y < 0)  #ifdef OSD_SCALE
1584          y = osd->widget->allocation.height - OSD_H + OSD_Y;      x =  OSD_X;
1585        y = -OSD_Y;
1586        if(x < 0) x += osd->widget->allocation.width - OSD_SCALE_W;
1587        if(y < 0) y += osd->widget->allocation.height - OSD_SCALE_H;
1588    
1589      cairo_set_source_surface(cr, priv->overlay, x, y);      cairo_set_source_surface(cr, priv->scale.surface, x, y);
1590        cairo_paint(cr);
1591    #endif
1592    
1593    #ifdef OSD_CROSSHAIR
1594        x = (osd->widget->allocation.width - OSD_CROSSHAIR_W)/2;
1595        y = (osd->widget->allocation.height - OSD_CROSSHAIR_H)/2;
1596    
1597        cairo_set_source_surface(cr, priv->crosshair.surface, x, y);
1598        cairo_paint(cr);
1599    #endif
1600    
1601    #ifdef OSD_COORDINATES
1602        x = -OSD_X;
1603        y = -OSD_Y;
1604        if(x < 0) x += osd->widget->allocation.width - OSD_COORDINATES_W;
1605        if(y < 0) y += osd->widget->allocation.height - OSD_COORDINATES_H;
1606    
1607        cairo_set_source_surface(cr, priv->coordinates.surface, x, y);
1608        cairo_paint(cr);
1609    #endif
1610    
1611    #ifdef OSD_BALLOON
1612        if(priv->balloon.surface) {
1613    
1614            /* convert given lat lon into screen coordinates */
1615            gint x, y;
1616            osm_gps_map_geographic_to_screen (OSM_GPS_MAP(osd->widget),
1617                                          priv->balloon.lat, priv->balloon.lon,
1618                                          &x, &y);
1619    
1620            /* check if balloon needs to be rerendered */
1621            osd_render_balloon(osd);
1622    
1623            cairo_set_source_surface(cr, priv->balloon.surface,
1624                                     x + priv->balloon.offset_x,
1625                                     y + priv->balloon.offset_y);
1626            cairo_paint(cr);
1627        }
1628    #endif
1629    
1630        x = OSD_X;
1631        if(x < 0)
1632            x += osd->widget->allocation.width - OSD_W;
1633    
1634        y = OSD_Y;
1635        if(y < 0)
1636            y += osd->widget->allocation.height - OSD_H;
1637    
1638        cairo_set_source_surface(cr, priv->controls.surface, x, y);
1639      cairo_paint(cr);      cairo_paint(cr);
1640    
1641  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1642      if(!priv->handler_id) {      if(!priv->source_sel.handler_id) {
1643          /* the OSD source selection is not being animated */          /* the OSD source selection is not being animated */
1644          if(!priv->expanded)          if(!priv->source_sel.expanded)
1645              x = osd->widget->allocation.width - OSD_S_W;              x = osd->widget->allocation.width - OSD_S_W;
1646          else          else
1647              x = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;              x = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;
1648      } else      } else
1649          x = priv->shift;          x = priv->source_sel.shift;
1650    
1651      y = OSD_S_Y;      y = OSD_S_Y;
1652      if(OSD_S_Y < 0) {      if(OSD_S_Y < 0) {
1653          if(!priv->expanded)          if(!priv->source_sel.expanded)
1654              y = osd->widget->allocation.height - OSD_S_H + OSD_S_Y;              y = osd->widget->allocation.height - OSD_S_H + OSD_S_Y;
1655          else          else
1656              y = osd->widget->allocation.height - OSD_S_EXP_H + OSD_S_Y;              y = osd->widget->allocation.height - OSD_S_EXP_H + OSD_S_Y;
1657      }      }
1658    
1659      cairo_set_source_surface(cr, priv->map_source, x, y);      cairo_set_source_surface(cr, priv->source_sel.surface, x, y);
1660      cairo_paint(cr);      cairo_paint(cr);
1661  #endif  #endif
1662    
# Line 874  osd_free(osm_gps_map_osd_t *osd) Line 1668  osd_free(osm_gps_map_osd_t *osd)
1668  {  {
1669      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1670    
1671      if (priv->overlay)      if (priv->controls.surface)
1672           cairo_surface_destroy(priv->overlay);           cairo_surface_destroy(priv->controls.surface);
1673    
1674  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1675      if(priv->handler_id)      if(priv->source_sel.handler_id)
1676          gtk_timeout_remove(priv->handler_id);          gtk_timeout_remove(priv->source_sel.handler_id);
1677    
1678        if (priv->source_sel.surface)
1679             cairo_surface_destroy(priv->source_sel.surface);
1680    #endif
1681    
1682      if (priv->map_source)  #ifdef OSD_SCALE
1683           cairo_surface_destroy(priv->map_source);      if (priv->scale.surface)
1684             cairo_surface_destroy(priv->scale.surface);
1685    #endif
1686    
1687    #ifdef OSD_CROSSHAIR
1688        if (priv->crosshair.surface)
1689             cairo_surface_destroy(priv->crosshair.surface);
1690    #endif
1691    
1692    #ifdef OSD_COORDINATES
1693        if (priv->coordinates.surface)
1694             cairo_surface_destroy(priv->coordinates.surface);
1695    #endif
1696    
1697    #ifdef OSD_BALLOON
1698        if (priv->balloon.surface)
1699             cairo_surface_destroy(priv->balloon.surface);
1700  #endif  #endif
1701    
1702      g_free(priv);      g_free(priv);
# Line 893  osd_busy(osm_gps_map_osd_t *osd) Line 1707  osd_busy(osm_gps_map_osd_t *osd)
1707  {  {
1708  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1709      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1710      return (priv->handler_id != 0);      return (priv->source_sel.handler_id != 0);
1711  #else  #else
1712      return FALSE;      return FALSE;
1713  #endif  #endif
# Line 920  osm_gps_map_osd_classic_init(OsmGpsMap * Line 1734  osm_gps_map_osd_classic_init(OsmGpsMap *
1734  {  {
1735      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);
1736    
1737    #ifdef OSD_BALLOON
1738        priv->balloon.lat = OSM_GPS_MAP_INVALID;
1739        priv->balloon.lon = OSM_GPS_MAP_INVALID;
1740    #endif
1741    
1742      osd_classic.priv = priv;      osd_classic.priv = priv;
1743    
1744      osm_gps_map_register_osd(map, &osd_classic);      osm_gps_map_register_osd(map, &osd_classic);
# Line 949  osm_gps_map_osd_check(OsmGpsMap *map, gi Line 1768  osm_gps_map_osd_check(OsmGpsMap *map, gi
1768      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
1769      g_return_val_if_fail (osd, OSD_NONE);      g_return_val_if_fail (osd, OSD_NONE);
1770    
1771      return osd_check(osd, x, y);      return osd_check(osd, TRUE, x, y);
1772  }  }

Legend:
Removed from v.94  
changed lines
  Added in v.114