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

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

revision 86 by harbaum, Sun Aug 30 19:05:44 2009 UTC revision 110 by harbaum, Sat Sep 12 20:56:35 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 <math.h>    // M_PI  #include <math.h>    // M_PI/cos()
   
 #define OSD_SOURCE_SEL  
   
 #define OSD_Y  (-10)  
23    
24  /* parameters that can be overwritten from the config file: */  /* parameters that can be overwritten from the config file: */
25  /* OSD_DIAMETER */  /* OSD_DIAMETER */
# Line 41  Line 37 
37  //the osd controls  //the osd controls
38  typedef struct {  typedef struct {
39      /* the offscreen representation of the OSD */      /* the offscreen representation of the OSD */
40      cairo_surface_t *overlay;      struct {
41            cairo_surface_t *surface;
42            gboolean rendered;
43    #ifdef OSD_GPS_BUTTON
44            gboolean gps_enabled;
45    #endif
46        } controls;
47    
48    #ifdef OSD_SCALE
49        struct {
50            cairo_surface_t *surface;
51            int zoom;
52        } scale;
53    #endif
54    
55    #ifdef OSD_CROSSHAIR
56        struct {
57            cairo_surface_t *surface;
58            gboolean rendered;
59        } crosshair;
60    #endif
61    
62    #ifdef OSD_COORDINATES
63        struct {
64            cairo_surface_t *surface;
65            float lat, lon;
66        } coordinates;
67    #endif
68    
69    #ifdef OSD_SOURCE_SEL
70        struct {
71            /* values to handle the "source" menu */
72            cairo_surface_t *surface;
73            gboolean expanded;
74            gint shift, dir, count;
75            gint handler_id;
76            gint width, height;
77        } source_sel;
78    #endif
79    
     cairo_surface_t *map_source;  
     gboolean expanded;  
     gint shift, dir, count;  
     gint handler_id;  
80  } osd_priv_t;  } osd_priv_t;
81    
82  /* position and extent of bounding box */  /* position and extent of bounding box */
# Line 128  osd_labels(cairo_t *cr, gint width, gboo Line 158  osd_labels(cairo_t *cr, gint width, gboo
158      if(enabled)  gdk_cairo_set_source_color(cr, fg);      if(enabled)  gdk_cairo_set_source_color(cr, fg);
159      else         gdk_cairo_set_source_color(cr, disabled);      else         gdk_cairo_set_source_color(cr, disabled);
160      cairo_set_line_width (cr, width);      cairo_set_line_width (cr, width);
     cairo_stroke (cr);  
161  }  }
162  #else  #else
163  static void  static void
# Line 136  osd_labels(cairo_t *cr, gint width, gboo Line 165  osd_labels(cairo_t *cr, gint width, gboo
165      if(enabled)  cairo_set_source_rgb (cr, OSD_COLOR);      if(enabled)  cairo_set_source_rgb (cr, OSD_COLOR);
166      else         cairo_set_source_rgb (cr, OSD_COLOR_DISABLED);      else         cairo_set_source_rgb (cr, OSD_COLOR_DISABLED);
167      cairo_set_line_width (cr, width);      cairo_set_line_width (cr, width);
     cairo_stroke (cr);  
168  }  }
169  #endif  #endif
170    
# Line 145  static void Line 173  static void
173  osd_labels_shadow(cairo_t *cr, gint width, gboolean enabled) {  osd_labels_shadow(cairo_t *cr, gint width, gboolean enabled) {
174      cairo_set_source_rgba (cr, 0, 0, 0, enabled?0.3:0.15);      cairo_set_source_rgba (cr, 0, 0, 0, enabled?0.3:0.15);
175      cairo_set_line_width (cr, width);      cairo_set_line_width (cr, width);
     cairo_stroke (cr);  
176  }  }
177  #endif  #endif
178    
# Line 262  osd_check_zoom(gint x, gint y) { Line 289  osd_check_zoom(gint x, gint y) {
289      return OSD_NONE;      return OSD_NONE;
290  }  }
291    
292    #ifdef OSD_SOURCE_SEL
293    
294  /* place source selection at right border */  /* place source selection at right border */
295  #define OSD_S_RAD (Z_RAD)  #define OSD_S_RAD (Z_RAD)
296  #define OSD_S_X   (-OSD_X)  #define OSD_S_X   (-OSD_X)
# Line 271  osd_check_zoom(gint x, gint y) { Line 300  osd_check_zoom(gint x, gint y) {
300  #define OSD_S_PH  (2 * Z_RAD)  #define OSD_S_PH  (2 * Z_RAD)
301  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)
302    
303  /* size of usable area when exapnded */  /* size of usable area when expanded */
304  #define OSD_S_AREA_W (200)  #define OSD_S_AREA_W (priv->source_sel.width)
305  #define OSD_S_AREA_H (200)  #define OSD_S_AREA_H (priv->source_sel.height)
306  #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)
307  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)
308    
309  /* internal value to draw the arrow on the "puller" */  /* internal value to draw the arrow on the "puller" */
310  #define OSD_S_D0  (OSD_S_RAD/2)  #define OSD_S_D0  (OSD_S_RAD/2)
311    #ifndef OSD_FONT_SIZE
312    #define OSD_FONT_SIZE 16.0
313    #endif
314    #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)
315    #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)
316    
317    /* draw the shape of the source selection OSD, either only the puller (not expanded) */
318    /* or the entire menu incl. the puller (expanded) */
319  static void  static void
320  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) {
321      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
322          /* just draw the puller */          /* just draw the puller */
323          cairo_move_to (cr, x + OSD_S_PW, y + OSD_S_PH);          cairo_move_to (cr, x + OSD_S_PW, y + OSD_S_PH);
324          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 305  osd_source_shape(osd_priv_t *priv, cairo Line 341  osd_source_shape(osd_priv_t *priv, cairo
341  }  }
342    
343  static void  static void
344  osd_source_content(osd_priv_t *priv, cairo_t *cr, gint x, gint y) {  osd_source_content(osm_gps_map_osd_t *osd, cairo_t *cr, gint offset) {
345      y += OSD_S_RAD - OSD_S_D0;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
346    
347        int py = offset + OSD_S_RAD - OSD_S_D0;
348    
349      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
350          /* draw the "puller" open (<) arrow */          /* draw the "puller" open (<) arrow */
351          cairo_move_to (cr, x + OSD_S_RAD + OSD_S_D0/2, y);          cairo_move_to (cr, offset + OSD_S_RAD + OSD_S_D0/2, py);
352          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);
353          cairo_rel_line_to (cr, +OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, +OSD_S_D0, +OSD_S_D0);
354      } else {      } else {
355          if(OSD_S_Y < 0)          if(OSD_S_Y < 0)
356              y += OSD_S_AREA_H - OSD_S_PH;              py += OSD_S_AREA_H - OSD_S_PH;
357    
358          /* draw the "puller" close (>) arrow */          /* draw the "puller" close (>) arrow */
359          cairo_move_to (cr, x + OSD_S_RAD - OSD_S_D0/2, y);          cairo_move_to (cr, offset + OSD_S_RAD - OSD_S_D0/2, py);
360          cairo_rel_line_to (cr, +OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, +OSD_S_D0, +OSD_S_D0);
361          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);
362            cairo_stroke(cr);
363    
364            /* don't draw a shadow for the text content */
365            if(offset == 1) {
366                gint source;
367                g_object_get(osd->widget, "map-source", &source, NULL);
368    
369                cairo_select_font_face (cr, "Sans",
370                                        CAIRO_FONT_SLANT_NORMAL,
371                                        CAIRO_FONT_WEIGHT_BOLD);
372                cairo_set_font_size (cr, OSD_FONT_SIZE);
373    
374                int i, step = (priv->source_sel.height - 2*OSD_TEXT_BORDER) /
375                    OSM_GPS_MAP_SOURCE_LAST;
376                for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {
377                    cairo_text_extents_t extents;
378                    const char *src = osm_gps_map_source_get_friendly_name(i);
379                    cairo_text_extents (cr, src, &extents);
380    
381                    int x = offset + OSD_S_PW + OSD_TEXT_BORDER;
382                    int y = offset + step * (i-1) + OSD_TEXT_BORDER;
383    
384                    /* draw filled rectangle if selected */
385                    if(source == i) {
386                        cairo_rectangle(cr, x - OSD_TEXT_BORDER/2,
387                                        y - OSD_TEXT_SKIP,
388                                        priv->source_sel.width - OSD_TEXT_BORDER,
389                                        step + OSD_TEXT_SKIP);
390                        cairo_fill(cr);
391    
392                        /* temprarily draw with background color */
393    #ifndef OSD_COLOR
394                        GdkColor bg = osd->widget->style->bg[GTK_STATE_NORMAL];
395                        gdk_cairo_set_source_color(cr, &bg);
396    #else
397                        cairo_set_source_rgb (cr, OSD_COLOR_BG);
398    #endif
399                    }
400    
401                    cairo_move_to (cr, x, y + OSD_TEXT_SKIP - extents.y_bearing);
402                    cairo_show_text (cr, src);
403    
404                    /* restore color */
405                    if(source == i) {
406    #ifndef OSD_COLOR
407                        GdkColor fg = osd->widget->style->fg[GTK_STATE_NORMAL];
408                        gdk_cairo_set_source_color(cr, &fg);
409    #else
410                        cairo_set_source_rgb (cr, OSD_COLOR);
411    #endif
412                    }
413                }
414            }
415      }      }
416  }  }
417    
# Line 335  osd_render_source_sel(osm_gps_map_osd_t Line 426  osd_render_source_sel(osm_gps_map_osd_t
426  #endif  #endif
427    
428      /* draw source selector */      /* draw source selector */
429      cairo_t *cr = cairo_create(priv->map_source);      cairo_t *cr = cairo_create(priv->source_sel.surface);
430      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
431      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);
432      cairo_paint(cr);      cairo_paint(cr);
# Line 354  osd_render_source_sel(osm_gps_map_osd_t Line 445  osd_render_source_sel(osm_gps_map_osd_t
445  #endif  #endif
446    
447  #ifdef OSD_SHADOW_ENABLE  #ifdef OSD_SHADOW_ENABLE
     osd_source_content(priv, cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);  
448      osd_labels_shadow(cr, Z_RAD/3, TRUE);      osd_labels_shadow(cr, Z_RAD/3, TRUE);
449        osd_source_content(osd, cr, 1+OSD_LBL_SHADOW);
450        cairo_stroke (cr);
451  #endif  #endif
     osd_source_content(priv, cr, 1, 1);  
452  #ifndef OSD_COLOR  #ifndef OSD_COLOR
453      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);
454  #else  #else
455      osd_labels(cr, Z_RAD/3, TRUE);      osd_labels(cr, Z_RAD/3, TRUE);
456  #endif  #endif
457        osd_source_content(osd, cr, 1);
458        cairo_stroke (cr);
459    
460      cairo_destroy(cr);      cairo_destroy(cr);
461  }  }
462    
463    /* re-allocate the buffer used to draw the menu. This is used */
464    /* to collapse/expand the buffer */
465  static void  static void
466  osd_source_reallocate(osm_gps_map_osd_t *osd) {  osd_source_reallocate(osm_gps_map_osd_t *osd) {
467      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
468    
469      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
470      g_assert (priv->map_source);      g_assert (priv->source_sel.surface);
     cairo_surface_destroy(priv->map_source);  
471    
472      int w = OSD_S_W, h = OSD_S_H;      int w = OSD_S_W, h = OSD_S_H;
473      if(priv->expanded) {      if(priv->source_sel.expanded) {
474            cairo_text_extents_t extents;
475    
476            /* determine content size */
477            cairo_t *cr = cairo_create(priv->source_sel.surface);
478            cairo_select_font_face (cr, "Sans",
479                                    CAIRO_FONT_SLANT_NORMAL,
480                                    CAIRO_FONT_WEIGHT_BOLD);
481            cairo_set_font_size (cr, OSD_FONT_SIZE);
482    
483            /* calculate menu size */
484            int i, max_h = 0, max_w = 0;
485            for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {
486                const char *src = osm_gps_map_source_get_friendly_name(i);
487                cairo_text_extents (cr, src, &extents);
488    
489                if(extents.width > max_w) max_w = extents.width;
490                if(extents.height > max_h) max_h = extents.height;
491            }
492            cairo_destroy(cr);
493    
494            priv->source_sel.width  = max_w + 2*OSD_TEXT_BORDER;
495            priv->source_sel.height = OSM_GPS_MAP_SOURCE_LAST *
496                (max_h + 2*OSD_TEXT_SKIP) + 2*OSD_TEXT_BORDER;
497    
498          w = OSD_S_EXP_W;          w = OSD_S_EXP_W;
499          h = OSD_S_EXP_H;          h = OSD_S_EXP_H;
500      }      }
501    
502      priv->map_source =      cairo_surface_destroy(priv->source_sel.surface);
503        priv->source_sel.surface =
504          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
505    
506      osd_render_source_sel(osd);      osd_render_source_sel(osd);
   
507  }  }
508    
509  #define OSD_HZ      15  #define OSD_HZ      15
510  #define OSD_TIME    1000  #define OSD_TIME    500
511    
512  static gboolean osd_source_animate(gpointer data) {  static gboolean osd_source_animate(gpointer data) {
513      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;
514      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
515      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;
516      gboolean done = FALSE;      gboolean done = FALSE;
517      priv->count += priv->dir;      priv->source_sel.count += priv->source_sel.dir;
518    
519      /* shifting in */      /* shifting in */
520      if(priv->dir < 0) {      if(priv->source_sel.dir < 0) {
521          if(priv->count <= 0) {          if(priv->source_sel.count <= 0) {
522              priv->count = 0;              priv->source_sel.count = 0;
523              done = TRUE;              done = TRUE;
524          }          }
525      } else {      } else {
526          if(priv->count >= 1000) {          if(priv->source_sel.count >= 1000) {
527              priv->expanded = FALSE;              priv->source_sel.expanded = FALSE;
528              osd_source_reallocate(osd);              osd_source_reallocate(osd);
529    
530              priv->count = 1000;              priv->source_sel.count = 1000;
531              done = TRUE;              done = TRUE;
532          }          }
533      }      }
# Line 417  static gboolean osd_source_animate(gpoin Line 535  static gboolean osd_source_animate(gpoin
535    
536      /* 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 */
537    
     /* simple linear mapping */  
     //    priv->shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +  
     //        (diff * priv->count)/1000;  
   
538      /* nicer sinoid mapping */      /* nicer sinoid mapping */
539      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;
540      priv->shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +      priv->source_sel.shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +
541          m * diff;          m * diff;
542    
543      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
544    
545      if(done)      if(done)
546          priv->handler_id = 0;          priv->source_sel.handler_id = 0;
547    
548      return !done;      return !done;
549  }  }
# Line 441  osd_source_toggle(osm_gps_map_osd_t *osd Line 555  osd_source_toggle(osm_gps_map_osd_t *osd
555      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
556    
557      /* ignore clicks while animation is running */      /* ignore clicks while animation is running */
558      if(priv->handler_id)      if(priv->source_sel.handler_id)
559          return;          return;
560    
561      /* expand immediately, collapse is handle at the end of the collapse animation */      /* expand immediately, collapse is handle at the end of the collapse animation */
562      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
563          priv->expanded = TRUE;          priv->source_sel.expanded = TRUE;
564          osd_source_reallocate(osd);          osd_source_reallocate(osd);
565    
566          priv->count = 1000;          priv->source_sel.count = 1000;
567          priv->shift = osd->widget->allocation.width - OSD_S_W;          priv->source_sel.shift = osd->widget->allocation.width - OSD_S_W;
568          priv->dir = -1000/OSD_HZ;          priv->source_sel.dir = -1000/OSD_HZ;
569      } else {      } else {
570          priv->count =  0;          priv->source_sel.count =  0;
571          priv->shift = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;          priv->source_sel.shift = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;
572          priv->dir = +1000/OSD_HZ;          priv->source_sel.dir = +1000/OSD_HZ;
573      }      }
574    
575      priv->handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ, osd_source_animate, osd);      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ, osd_source_animate, osd);
576  }  }
577    
578    /* check if the user clicked inside the source selection area */
579  static osd_button_t  static osd_button_t
580  osd_source_check(osm_gps_map_osd_t *osd, gint x, gint y) {  osd_source_check(osm_gps_map_osd_t *osd, gint x, gint y) {
581      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
582    
583      if(!priv->expanded)      if(!priv->source_sel.expanded)
584          x -= osd->widget->allocation.width - OSD_S_W;          x -= osd->widget->allocation.width - OSD_S_W;
585      else      else
586          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 487  osd_source_check(osm_gps_map_osd_t *osd, Line 602  osd_source_check(osm_gps_map_osd_t *osd,
602              return OSD_BG;              return OSD_BG;
603          }          }
604      }      }
605    
606        /* check for clicks into data area */
607        if(priv->source_sel.expanded && !priv->source_sel.handler_id) {
608            /* re-adjust from puller top to content top */
609            if(OSD_S_Y < 0)
610                y += OSD_S_EXP_H - OSD_S_PH;
611    
612            if(x > OSD_S_PW &&
613               x < OSD_S_PW + OSD_S_EXP_W &&
614               y > 0 &&
615               y < OSD_S_EXP_H) {
616    
617                int step = (priv->source_sel.height - 2*OSD_TEXT_BORDER)
618                    / OSM_GPS_MAP_SOURCE_LAST;
619    
620                y -= OSD_TEXT_BORDER - OSD_TEXT_SKIP;
621                y /= step;
622                y += 1;
623    
624                gint old = 0;
625                g_object_get(osd->widget, "map-source", &old, NULL);
626    
627                if(y > OSM_GPS_MAP_SOURCE_NULL &&
628                   y <= OSM_GPS_MAP_SOURCE_LAST &&
629                   old != y) {
630                    g_object_set(osd->widget, "map-source", y, NULL);
631    
632                    osd_render_source_sel(osd);
633                    osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
634                }
635    
636                /* return "clicked in OSD background" to prevent further */
637                /* processing by application */
638                return OSD_BG;
639            }
640        }
641    
642      return OSD_NONE;      return OSD_NONE;
643  }  }
644    #endif // OSD_SOURCE_SEL
645    
646  static osd_button_t  static osd_button_t
647  osd_check(osm_gps_map_osd_t *osd, gint x, gint y) {  osd_check(osm_gps_map_osd_t *osd, gint x, gint y) {
# Line 594  osd_zoom_labels(cairo_t *cr, gint x, gin Line 747  osd_zoom_labels(cairo_t *cr, gint x, gin
747      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);
748  }  }
749    
750    #ifdef OSD_COORDINATES
751    
752    #ifndef OSD_COORDINATES_FONT_SIZE
753    #define OSD_COORDINATES_FONT_SIZE 12
754    #endif
755    
756    #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
757    
758    #define OSD_COORDINATES_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)
759    #define OSD_COORDINATES_H  (2*OSD_COORDINATES_FONT_SIZE+OSD_COORDINATES_OFFSET)
760    
761    /* these can be overwritten with versions that support */
762    /* localization */
763    #ifndef OSD_COORDINATES_CHR_N
764    #define OSD_COORDINATES_CHR_N  "N"
765    #endif
766    #ifndef OSD_COORDINATES_CHR_S
767    #define OSD_COORDINATES_CHR_S  "S"
768    #endif
769    #ifndef OSD_COORDINATES_CHR_E
770    #define OSD_COORDINATES_CHR_E  "E"
771    #endif
772    #ifndef OSD_COORDINATES_CHR_W
773    #define OSD_COORDINATES_CHR_W  "W"
774    #endif
775    
776    
777    
778    /* this is the classic geocaching notation */
779    static char
780    *osd_latitude_str(float latitude) {
781        char *c = OSD_COORDINATES_CHR_N;
782        float integral, fractional;
783    
784        if(isnan(latitude))
785            return NULL;
786    
787        if(latitude < 0) {
788            latitude = fabs(latitude);
789            c = OSD_COORDINATES_CHR_S;
790        }
791    
792        fractional = modff(latitude, &integral);
793    
794        return g_strdup_printf("%s %02d° %06.3f'",
795                               c, (int)integral, fractional*60.0);
796    }
797    
798    static char
799    *osd_longitude_str(float longitude) {
800        char *c = OSD_COORDINATES_CHR_E;
801        float integral, fractional;
802    
803        if(isnan(longitude))
804            return NULL;
805    
806        if(longitude < 0) {
807            longitude = fabs(longitude);
808            c = OSD_COORDINATES_CHR_W;
809        }
810    
811        fractional = modff(longitude, &integral);
812    
813        return g_strdup_printf("%s %03d° %06.3f'",
814                               c, (int)integral, fractional*60.0);
815    }
816    
817    static void
818    osd_render_coordinates(osm_gps_map_osd_t *osd)
819    {
820        osd_priv_t *priv = (osd_priv_t*)osd->priv;
821    
822        /* get current map position */
823        gfloat lat, lon;
824        g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
825    
826        /* check if position has changed enough to require redraw */
827        if(!isnan(priv->coordinates.lat) && !isnan(priv->coordinates.lon))
828            /* 1/60000 == 1/1000 minute */
829            if((fabsf(lat - priv->coordinates.lat) < 1/60000) &&
830               (fabsf(lon - priv->coordinates.lon) < 1/60000))
831                return;
832    
833        priv->coordinates.lat = lat;
834        priv->coordinates.lon = lon;
835    
836        /* first fill with light transparency */
837        cairo_t *cr = cairo_create(priv->coordinates.surface);
838        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
839        cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.5);
840        cairo_paint(cr);
841        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
842    
843        cairo_select_font_face (cr, "Sans",
844                                CAIRO_FONT_SLANT_NORMAL,
845                                CAIRO_FONT_WEIGHT_BOLD);
846        cairo_set_font_size (cr, OSD_COORDINATES_FONT_SIZE);
847    
848        char *latitude = osd_latitude_str(lat);
849        char *longitude = osd_longitude_str(lon);
850    
851        cairo_text_extents_t lat_extents, lon_extents;
852        cairo_text_extents (cr, latitude, &lat_extents);
853        cairo_text_extents (cr, longitude, &lon_extents);
854    
855        cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
856        cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);
857        cairo_move_to (cr,
858                       (OSD_COORDINATES_W - lat_extents.width)/2,
859                       OSD_COORDINATES_OFFSET - lat_extents.y_bearing);
860        cairo_text_path (cr, latitude);
861        cairo_move_to (cr,
862                       (OSD_COORDINATES_W - lon_extents.width)/2,
863                       OSD_COORDINATES_OFFSET - lon_extents.y_bearing +
864                       OSD_COORDINATES_FONT_SIZE);
865        cairo_text_path (cr, longitude);
866        cairo_stroke (cr);
867    
868        cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
869        cairo_move_to (cr,
870                       (OSD_COORDINATES_W - lat_extents.width)/2,
871                       OSD_COORDINATES_OFFSET - lat_extents.y_bearing);
872        cairo_show_text (cr, latitude);
873        cairo_move_to (cr,
874                       (OSD_COORDINATES_W - lon_extents.width)/2,
875                       OSD_COORDINATES_OFFSET - lon_extents.y_bearing +
876                       OSD_COORDINATES_FONT_SIZE);
877        cairo_show_text (cr, longitude);
878    
879        g_free(latitude);
880        g_free(longitude);
881    
882        cairo_destroy(cr);
883    }
884    #endif  // OSD_COORDINATES
885    
886    #ifdef OSD_CROSSHAIR
887    
888    #ifndef OSD_CROSSHAIR_RADIUS
889    #define OSD_CROSSHAIR_RADIUS 10
890    #endif
891    
892    #define OSD_CROSSHAIR_TICK  (OSD_CROSSHAIR_RADIUS/2)
893    #define OSD_CROSSHAIR_BORDER (OSD_CROSSHAIR_TICK + OSD_CROSSHAIR_RADIUS/4)
894    #define OSD_CROSSHAIR_W  ((OSD_CROSSHAIR_RADIUS+OSD_CROSSHAIR_BORDER)*2)
895    #define OSD_CROSSHAIR_H  ((OSD_CROSSHAIR_RADIUS+OSD_CROSSHAIR_BORDER)*2)
896    
897    static void
898    osd_render_crosshair_shape(cairo_t *cr) {
899        cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,
900                   OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);
901    
902        cairo_move_to (cr, OSD_CROSSHAIR_W/2 - OSD_CROSSHAIR_RADIUS,
903                       OSD_CROSSHAIR_H/2);
904        cairo_rel_line_to (cr, -OSD_CROSSHAIR_TICK, 0);
905        cairo_move_to (cr, OSD_CROSSHAIR_W/2 + OSD_CROSSHAIR_RADIUS,
906                       OSD_CROSSHAIR_H/2);
907        cairo_rel_line_to (cr,  OSD_CROSSHAIR_TICK, 0);
908    
909        cairo_move_to (cr, OSD_CROSSHAIR_W/2,
910                       OSD_CROSSHAIR_H/2 - OSD_CROSSHAIR_RADIUS);
911        cairo_rel_line_to (cr, 0, -OSD_CROSSHAIR_TICK);
912        cairo_move_to (cr, OSD_CROSSHAIR_W/2,
913                       OSD_CROSSHAIR_H/2 + OSD_CROSSHAIR_RADIUS);
914        cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);
915    
916        cairo_stroke (cr);
917    }
918    
919    static void
920    osd_render_crosshair(osm_gps_map_osd_t *osd)
921    {
922        osd_priv_t *priv = (osd_priv_t*)osd->priv;
923    
924        if(priv->crosshair.rendered)
925            return;
926    
927        priv->crosshair.rendered = TRUE;
928    
929        /* first fill with transparency */
930        cairo_t *cr = cairo_create(priv->crosshair.surface);
931        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
932        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
933        cairo_paint(cr);
934        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
935    
936        cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
937    
938        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.5);
939        cairo_set_line_width (cr, OSD_CROSSHAIR_RADIUS/2);
940        osd_render_crosshair_shape(cr);
941    
942        cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
943        cairo_set_line_width (cr, OSD_CROSSHAIR_RADIUS/4);
944        osd_render_crosshair_shape(cr);
945    
946        cairo_destroy(cr);
947    }
948    #endif
949    
950    #ifdef OSD_SCALE
951    
952    #ifndef OSD_SCALE_FONT_SIZE
953    #define OSD_SCALE_FONT_SIZE 12
954    #endif
955    #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)
956    #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)
957    
958    /* various parameters used to create the scale */
959    #define OSD_SCALE_H2   (OSD_SCALE_H/2)
960    #define OSD_SCALE_TICK (2*OSD_SCALE_FONT_SIZE/3)
961    #define OSD_SCALE_M    (OSD_SCALE_H2 - OSD_SCALE_TICK)
962    #define OSD_SCALE_I    (OSD_SCALE_H2 + OSD_SCALE_TICK)
963    #define OSD_SCALE_FD   (OSD_SCALE_FONT_SIZE/4)
964    
965    static void
966    osd_render_scale(osm_gps_map_osd_t *osd)
967    {
968        osd_priv_t *priv = (osd_priv_t*)osd->priv;
969    
970        /* this only needs to be rendered if the zoom has changed */
971        gint zoom;
972        g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
973        if(zoom == priv->scale.zoom)
974            return;
975    
976        priv->scale.zoom = zoom;
977    
978        float m_per_pix = osm_gps_map_get_scale(OSM_GPS_MAP(osd->widget));
979    
980        /* first fill with transparency */
981        cairo_t *cr = cairo_create(priv->scale.surface);
982        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
983        cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
984        // pink for testing:    cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);
985        cairo_paint(cr);
986        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
987    
988        /* determine the size of the scale width in meters */
989        float width = (OSD_SCALE_W-OSD_SCALE_FONT_SIZE/6) * m_per_pix;
990    
991        /* scale this to useful values */
992        int exp = logf(width)*M_LOG10E;
993        int mant = width/pow(10,exp);
994        int width_metric = mant * pow(10,exp);
995        char *dist_str = NULL;
996        if(width_metric<1000)
997            dist_str = g_strdup_printf("%u m", width_metric);
998        else
999            dist_str = g_strdup_printf("%u km", width_metric/1000);
1000        width_metric /= m_per_pix;
1001    
1002        /* and now the hard part: scale for useful imperial values :-( */
1003        /* try to convert to feet, 1ft == 0.3048 m */
1004        width /= 0.3048;
1005        float imp_scale = 0.3048;
1006        char *dist_imp_unit = "ft";
1007    
1008        if(width >= 100) {
1009            /* 1yd == 3 feet */
1010            width /= 3.0;
1011            imp_scale *= 3.0;
1012            dist_imp_unit = "yd";
1013    
1014            if(width >= 1760.0) {
1015                /* 1mi == 1760 yd */
1016                width /= 1760.0;
1017                imp_scale *= 1760.0;
1018                dist_imp_unit = "mi";
1019            }
1020        }
1021    
1022        /* also convert this to full tens/hundreds */
1023        exp = logf(width)*M_LOG10E;
1024        mant = width/pow(10,exp);
1025        int width_imp = mant * pow(10,exp);
1026        char *dist_str_imp = g_strdup_printf("%u %s", width_imp, dist_imp_unit);
1027    
1028        /* convert back to pixels */
1029        width_imp *= imp_scale;
1030        width_imp /= m_per_pix;
1031    
1032        cairo_select_font_face (cr, "Sans",
1033                                CAIRO_FONT_SLANT_NORMAL,
1034                                CAIRO_FONT_WEIGHT_BOLD);
1035        cairo_set_font_size (cr, OSD_SCALE_FONT_SIZE);
1036        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 1.0);
1037    
1038        cairo_text_extents_t extents;
1039        cairo_text_extents (cr, dist_str, &extents);
1040    
1041        cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
1042        cairo_set_line_width (cr, OSD_SCALE_FONT_SIZE/6);
1043        cairo_move_to (cr, 2*OSD_SCALE_FD, OSD_SCALE_H2-OSD_SCALE_FD);
1044        cairo_text_path (cr, dist_str);
1045        cairo_stroke (cr);
1046        cairo_move_to (cr, 2*OSD_SCALE_FD,
1047                       OSD_SCALE_H2+OSD_SCALE_FD + extents.height);
1048        cairo_text_path (cr, dist_str_imp);
1049        cairo_stroke (cr);
1050    
1051        cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
1052        cairo_move_to (cr, 2*OSD_SCALE_FD, OSD_SCALE_H2-OSD_SCALE_FD);
1053        cairo_show_text (cr, dist_str);
1054        cairo_move_to (cr, 2*OSD_SCALE_FD,
1055                       OSD_SCALE_H2+OSD_SCALE_FD + extents.height);
1056        cairo_show_text (cr, dist_str_imp);
1057    
1058        g_free(dist_str);
1059        g_free(dist_str_imp);
1060    
1061        /* draw white line */
1062        cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
1063        cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 1.0);
1064        cairo_set_line_width (cr, OSD_SCALE_FONT_SIZE/3);
1065        cairo_move_to (cr, OSD_SCALE_FONT_SIZE/6, OSD_SCALE_M);
1066        cairo_rel_line_to (cr, 0,  OSD_SCALE_TICK);
1067        cairo_rel_line_to (cr, width_metric, 0);
1068        cairo_rel_line_to (cr, 0, -OSD_SCALE_TICK);
1069        cairo_stroke(cr);
1070        cairo_move_to (cr, OSD_SCALE_FONT_SIZE/6, OSD_SCALE_I);
1071        cairo_rel_line_to (cr, 0, -OSD_SCALE_TICK);
1072        cairo_rel_line_to (cr, width_imp, 0);
1073        cairo_rel_line_to (cr, 0, +OSD_SCALE_TICK);
1074        cairo_stroke(cr);
1075    
1076        /* draw black line */
1077        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 1.0);
1078        cairo_set_line_width (cr, OSD_SCALE_FONT_SIZE/6);
1079        cairo_move_to (cr, OSD_SCALE_FONT_SIZE/6, OSD_SCALE_M);
1080        cairo_rel_line_to (cr, 0,  OSD_SCALE_TICK);
1081        cairo_rel_line_to (cr, width_metric, 0);
1082        cairo_rel_line_to (cr, 0, -OSD_SCALE_TICK);
1083        cairo_stroke(cr);
1084        cairo_move_to (cr, OSD_SCALE_FONT_SIZE/6, OSD_SCALE_I);
1085        cairo_rel_line_to (cr, 0, -OSD_SCALE_TICK);
1086        cairo_rel_line_to (cr, width_imp, 0);
1087        cairo_rel_line_to (cr, 0, +OSD_SCALE_TICK);
1088        cairo_stroke(cr);
1089    
1090        cairo_destroy(cr);
1091    }
1092    #endif
1093    
1094  static void  static void
1095  osd_render(osm_gps_map_osd_t *osd) {  osd_render_controls(osm_gps_map_osd_t *osd)
1096    {
1097      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1098    
1099        if(priv->controls.rendered
1100    #ifdef OSD_GPS_BUTTON
1101           && (priv->controls.gps_enabled == (osd->cb != NULL))
1102    #endif
1103           )
1104            return;
1105    
1106    #ifdef OSD_GPS_BUTTON
1107        priv->controls.gps_enabled = (osd->cb != NULL);
1108    #endif
1109        priv->controls.rendered = TRUE;
1110    
1111  #ifndef OSD_COLOR  #ifndef OSD_COLOR
1112      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];
1113      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];      GdkColor fg = GTK_WIDGET(osd->widget)->style->fg[GTK_STATE_NORMAL];
# Line 605  osd_render(osm_gps_map_osd_t *osd) { Line 1115  osd_render(osm_gps_map_osd_t *osd) {
1115  #endif  #endif
1116    
1117      /* first fill with transparency */      /* first fill with transparency */
1118      cairo_t *cr = cairo_create(priv->overlay);      cairo_t *cr = cairo_create(priv->controls.surface);
1119      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1120      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);
1121      cairo_paint(cr);      cairo_paint(cr);
# Line 641  osd_render(osm_gps_map_osd_t *osd) { Line 1151  osd_render(osm_gps_map_osd_t *osd) {
1151      /* --------- draw zoom and dpad labels --------- */      /* --------- draw zoom and dpad labels --------- */
1152    
1153  #ifdef OSD_SHADOW_ENABLE  #ifdef OSD_SHADOW_ENABLE
1154        osd_labels_shadow(cr, Z_RAD/3, TRUE);
1155      osd_zoom_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);      osd_zoom_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);
1156  #ifndef OSD_NO_DPAD  #ifndef OSD_NO_DPAD
1157      osd_dpad_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);      osd_dpad_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);
1158  #endif  #endif
1159      osd_labels_shadow(cr, Z_RAD/3, TRUE);      cairo_stroke(cr);
1160  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
     osd_dpad_gps(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);  
1161      osd_labels_shadow(cr, Z_RAD/6, osd->cb != NULL);      osd_labels_shadow(cr, Z_RAD/6, osd->cb != NULL);
1162        osd_dpad_gps(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);
1163        cairo_stroke(cr);
1164  #endif  #endif
1165  #endif  #endif
1166    
     osd_zoom_labels(cr, 1, 1);  
 #ifndef OSD_NO_DPAD  
     osd_dpad_labels(cr, 1, 1);  
 #endif  
1167  #ifndef OSD_COLOR  #ifndef OSD_COLOR
1168      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);
1169  #else  #else
1170      osd_labels(cr, Z_RAD/3, TRUE);      osd_labels(cr, Z_RAD/3, TRUE);
1171  #endif  #endif
1172  #ifdef OSD_GPS_BUTTON      osd_zoom_labels(cr, 1, 1);
1173      osd_dpad_gps(cr, 1, 1);  #ifndef OSD_NO_DPAD
1174        osd_dpad_labels(cr, 1, 1);
1175    #endif
1176        cairo_stroke(cr);
1177    
1178  #ifndef OSD_COLOR  #ifndef OSD_COLOR
1179      osd_labels(cr, Z_RAD/6, osd->cb != NULL, &fg, &da);      osd_labels(cr, Z_RAD/6, osd->cb != NULL, &fg, &da);
1180  #else  #else
1181      osd_labels(cr, Z_RAD/6, osd->cb != NULL);      osd_labels(cr, Z_RAD/6, osd->cb != NULL);
1182  #endif  #endif
1183    #ifdef OSD_GPS_BUTTON
1184        osd_dpad_gps(cr, 1, 1);
1185  #endif  #endif
1186        cairo_stroke(cr);
1187    
1188      cairo_destroy(cr);      cairo_destroy(cr);
1189    }
1190    
1191    static void
1192    osd_render(osm_gps_map_osd_t *osd)
1193    {
1194        osd_render_controls(osd);
1195    
1196    #ifdef OSD_SOURCE_SEL
1197      osd_render_source_sel(osd);      osd_render_source_sel(osd);
1198    #endif
1199    
1200    #ifdef OSD_SCALE
1201        osd_render_scale(osd);
1202    #endif
1203    
1204    #ifdef OSD_CROSSHAIR
1205        osd_render_crosshair(osd);
1206    #endif
1207    
1208    #ifdef OSD_COORDINATES
1209        osd_render_coordinates(osd);
1210    #endif
1211  }  }
1212    
1213  static void  static void
# Line 682  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1217  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1217    
1218      /* OSD itself uses some off-screen rendering, so check if the */      /* OSD itself uses some off-screen rendering, so check if the */
1219      /* offscreen buffer is present and create it if not */      /* offscreen buffer is present and create it if not */
1220      if(!priv->overlay) {      if(!priv->controls.surface) {
1221          /* create overlay ... */          /* create overlay ... */
1222          priv->overlay =          priv->controls.surface =
1223              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);
1224    
1225            priv->controls.rendered = FALSE;
1226    #ifdef OSD_GPS_BUTTON
1227            priv->controls.gps_enabled = FALSE;
1228    #endif
1229    
1230    #ifdef OSD_SOURCE_SEL
1231          /* the initial OSD state is alway not-expanded */          /* the initial OSD state is alway not-expanded */
1232          priv->map_source =          priv->source_sel.surface =
1233              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1234                                             OSD_S_W+2, OSD_S_H+2);                                             OSD_S_W+2, OSD_S_H+2);
1235    #endif
1236    
1237    #ifdef OSD_SCALE
1238            priv->scale.surface =
1239                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1240                                           OSD_SCALE_W, OSD_SCALE_H);
1241            priv->scale.zoom = -1;
1242    #endif
1243    
1244    #ifdef OSD_CROSSHAIR
1245            priv->crosshair.surface =
1246                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1247                                           OSD_CROSSHAIR_W, OSD_CROSSHAIR_H);
1248            priv->crosshair.rendered = FALSE;
1249    #endif
1250    
1251    #ifdef OSD_COORDINATES
1252            priv->coordinates.surface =
1253                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1254                                           OSD_COORDINATES_W, OSD_COORDINATES_H);
1255    
1256            priv->coordinates.lat = priv->coordinates.lon = OSM_GPS_MAP_INVALID;
1257    #endif
1258    
1259          /* ... and render it */          /* ... and render it */
1260          osd_render(osd);          osd_render(osd);
# Line 699  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1263  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1263      // now draw this onto the original context      // now draw this onto the original context
1264      cairo_t *cr = gdk_cairo_create(drawable);      cairo_t *cr = gdk_cairo_create(drawable);
1265    
1266      int x = OSD_X, y = OSD_Y;      int x, y;
     if(OSD_X < 0)  
         x = osd->widget->allocation.width - OSD_W + OSD_X;  
1267    
1268      if(OSD_Y < 0)  #ifdef OSD_SCALE
1269          y = osd->widget->allocation.height - OSD_H + OSD_Y;      x =  OSD_X;
1270        y = -OSD_Y;
1271        if(x < 0) x += osd->widget->allocation.width - OSD_SCALE_W;
1272        if(y < 0) y += osd->widget->allocation.height - OSD_SCALE_H;
1273    
1274        cairo_set_source_surface(cr, priv->scale.surface, x, y);
1275        cairo_paint(cr);
1276    #endif
1277    
1278    #ifdef OSD_CROSSHAIR
1279        x = (osd->widget->allocation.width - OSD_CROSSHAIR_W)/2;
1280        y = (osd->widget->allocation.height - OSD_CROSSHAIR_H)/2;
1281    
1282        cairo_set_source_surface(cr, priv->crosshair.surface, x, y);
1283        cairo_paint(cr);
1284    #endif
1285    
1286    #ifdef OSD_COORDINATES
1287        x = -OSD_X;
1288        y = -OSD_Y;
1289        if(x < 0) x += osd->widget->allocation.width - OSD_COORDINATES_W;
1290        if(y < 0) y += osd->widget->allocation.height - OSD_COORDINATES_H;
1291    
1292      cairo_set_source_surface(cr, priv->overlay, x, y);      cairo_set_source_surface(cr, priv->coordinates.surface, x, y);
1293        cairo_paint(cr);
1294    #endif
1295    
1296        x = OSD_X;
1297        if(x < 0)
1298            x += osd->widget->allocation.width - OSD_W;
1299    
1300        y = OSD_Y;
1301        if(y < 0)
1302            y += osd->widget->allocation.height - OSD_H;
1303    
1304        cairo_set_source_surface(cr, priv->controls.surface, x, y);
1305      cairo_paint(cr);      cairo_paint(cr);
1306    
1307  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1308      if(!priv->handler_id) {      if(!priv->source_sel.handler_id) {
1309          /* the OSD source selection is not being animated */          /* the OSD source selection is not being animated */
1310          if(!priv->expanded)          if(!priv->source_sel.expanded)
1311              x = osd->widget->allocation.width - OSD_S_W;              x = osd->widget->allocation.width - OSD_S_W;
1312          else          else
1313              x = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;              x = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;
1314      } else      } else
1315          x = priv->shift;          x = priv->source_sel.shift;
1316    
1317      y = OSD_S_Y;      y = OSD_S_Y;
1318      if(OSD_S_Y < 0) {      if(OSD_S_Y < 0) {
1319          if(!priv->expanded)          if(!priv->source_sel.expanded)
1320              y = osd->widget->allocation.height - OSD_S_H + OSD_S_Y;              y = osd->widget->allocation.height - OSD_S_H + OSD_S_Y;
1321          else          else
1322              y = osd->widget->allocation.height - OSD_S_EXP_H + OSD_S_Y;              y = osd->widget->allocation.height - OSD_S_EXP_H + OSD_S_Y;
1323      }      }
1324    
1325      cairo_set_source_surface(cr, priv->map_source, x, y);      cairo_set_source_surface(cr, priv->source_sel.surface, x, y);
1326      cairo_paint(cr);      cairo_paint(cr);
1327  #endif  #endif
1328    
# Line 739  osd_free(osm_gps_map_osd_t *osd) Line 1334  osd_free(osm_gps_map_osd_t *osd)
1334  {  {
1335      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1336    
1337      if(priv->handler_id)      if (priv->controls.surface)
1338          gtk_timeout_remove(priv->handler_id);           cairo_surface_destroy(priv->controls.surface);
1339    
1340    #ifdef OSD_SOURCE_SEL
1341        if(priv->source_sel.handler_id)
1342            gtk_timeout_remove(priv->source_sel.handler_id);
1343    
1344        if (priv->source_sel.surface)
1345             cairo_surface_destroy(priv->source_sel.surface);
1346    #endif
1347    
1348      if (priv->overlay)  #ifdef OSD_SCALE
1349           cairo_surface_destroy(priv->overlay);      if (priv->scale.surface)
1350             cairo_surface_destroy(priv->scale.surface);
1351    #endif
1352    
1353      if (priv->map_source)  #ifdef OSD_CROSSHAIR
1354           cairo_surface_destroy(priv->map_source);      if (priv->crosshair.surface)
1355             cairo_surface_destroy(priv->crosshair.surface);
1356    #endif
1357    
1358    #ifdef OSD_COORDINATES
1359        if (priv->coordinates.surface)
1360             cairo_surface_destroy(priv->coordinates.surface);
1361    #endif
1362    
1363      g_free(priv);      g_free(priv);
1364  }  }
1365    
1366    static gboolean
1367    osd_busy(osm_gps_map_osd_t *osd)
1368    {
1369    #ifdef OSD_SOURCE_SEL
1370        osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1371        return (priv->source_sel.handler_id != 0);
1372    #else
1373        return FALSE;
1374    #endif
1375    }
1376    
1377  static osm_gps_map_osd_t osd_classic = {  static osm_gps_map_osd_t osd_classic = {
1378        .widget     = NULL,
1379    
1380      .draw       = osd_draw,      .draw       = osd_draw,
1381      .check      = osd_check,      .check      = osd_check,
1382      .render     = osd_render,      .render     = osd_render,
1383      .free       = osd_free,      .free       = osd_free,
1384        .busy       = osd_busy,
1385    
1386      .cb         = NULL,      .cb         = NULL,
1387      .data       = NULL,      .data       = NULL,
Legend:
Removed from v.86  
changed lines
  Added in v.110