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 100 by harbaum, Tue Sep 8 10:24:11 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 */
26  /* OSD_X, OSD_Y */  /* OSD_X, OSD_Y */
27    
28    #define OSD_SCALE
29    
30    #define OSD_SCALE_W  120
31    #define OSD_SCALE_H   20
32    
33  #ifndef USE_CAIRO  #ifndef USE_CAIRO
34  #error "OSD control display lacks a non-cairo implementation!"  #error "OSD control display lacks a non-cairo implementation!"
35  #endif  #endif
# Line 43  typedef struct { Line 44  typedef struct {
44      /* the offscreen representation of the OSD */      /* the offscreen representation of the OSD */
45      cairo_surface_t *overlay;      cairo_surface_t *overlay;
46    
47    #ifdef OSD_SCALE
48        cairo_surface_t *scale;
49    #endif
50    
51    #ifdef OSD_SOURCE_SEL
52        /* values to handle the "source" menu */
53      cairo_surface_t *map_source;      cairo_surface_t *map_source;
54      gboolean expanded;      gboolean expanded;
55      gint shift, dir, count;      gint shift, dir, count;
56      gint handler_id;      gint handler_id;
57        gint width, height;
58    #endif
59    
60  } osd_priv_t;  } osd_priv_t;
61    
62  /* position and extent of bounding box */  /* position and extent of bounding box */
# Line 128  osd_labels(cairo_t *cr, gint width, gboo Line 138  osd_labels(cairo_t *cr, gint width, gboo
138      if(enabled)  gdk_cairo_set_source_color(cr, fg);      if(enabled)  gdk_cairo_set_source_color(cr, fg);
139      else         gdk_cairo_set_source_color(cr, disabled);      else         gdk_cairo_set_source_color(cr, disabled);
140      cairo_set_line_width (cr, width);      cairo_set_line_width (cr, width);
     cairo_stroke (cr);  
141  }  }
142  #else  #else
143  static void  static void
# Line 136  osd_labels(cairo_t *cr, gint width, gboo Line 145  osd_labels(cairo_t *cr, gint width, gboo
145      if(enabled)  cairo_set_source_rgb (cr, OSD_COLOR);      if(enabled)  cairo_set_source_rgb (cr, OSD_COLOR);
146      else         cairo_set_source_rgb (cr, OSD_COLOR_DISABLED);      else         cairo_set_source_rgb (cr, OSD_COLOR_DISABLED);
147      cairo_set_line_width (cr, width);      cairo_set_line_width (cr, width);
     cairo_stroke (cr);  
148  }  }
149  #endif  #endif
150    
# Line 145  static void Line 153  static void
153  osd_labels_shadow(cairo_t *cr, gint width, gboolean enabled) {  osd_labels_shadow(cairo_t *cr, gint width, gboolean enabled) {
154      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);
155      cairo_set_line_width (cr, width);      cairo_set_line_width (cr, width);
     cairo_stroke (cr);  
156  }  }
157  #endif  #endif
158    
# Line 262  osd_check_zoom(gint x, gint y) { Line 269  osd_check_zoom(gint x, gint y) {
269      return OSD_NONE;      return OSD_NONE;
270  }  }
271    
272    #ifdef OSD_SOURCE_SEL
273    
274  /* place source selection at right border */  /* place source selection at right border */
275  #define OSD_S_RAD (Z_RAD)  #define OSD_S_RAD (Z_RAD)
276  #define OSD_S_X   (-OSD_X)  #define OSD_S_X   (-OSD_X)
# Line 271  osd_check_zoom(gint x, gint y) { Line 280  osd_check_zoom(gint x, gint y) {
280  #define OSD_S_PH  (2 * Z_RAD)  #define OSD_S_PH  (2 * Z_RAD)
281  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)
282    
283  /* size of usable area when exapnded */  /* size of usable area when expanded */
284  #define OSD_S_AREA_W (200)  #define OSD_S_AREA_W (priv->width)
285  #define OSD_S_AREA_H (200)  #define OSD_S_AREA_H (priv->height)
286  #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)
287  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)
288    
289  /* internal value to draw the arrow on the "puller" */  /* internal value to draw the arrow on the "puller" */
290  #define OSD_S_D0  (OSD_S_RAD/2)  #define OSD_S_D0  (OSD_S_RAD/2)
291    #ifndef OSD_FONT_SIZE
292    #define OSD_FONT_SIZE 16.0
293    #endif
294    #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)
295    #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)
296    
297    /* draw the shape of the source selection OSD, either only the puller (not expanded) */
298    /* or the entire menu incl. the puller (expanded) */
299  static void  static void
300  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) {
301      if(!priv->expanded) {      if(!priv->expanded) {
# Line 305  osd_source_shape(osd_priv_t *priv, cairo Line 321  osd_source_shape(osd_priv_t *priv, cairo
321  }  }
322    
323  static void  static void
324  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) {
325      y += OSD_S_RAD - OSD_S_D0;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
326    
327        int py = offset + OSD_S_RAD - OSD_S_D0;
328    
329      if(!priv->expanded) {      if(!priv->expanded) {
330          /* draw the "puller" open (<) arrow */          /* draw the "puller" open (<) arrow */
331          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);
332          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);
333          cairo_rel_line_to (cr, +OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, +OSD_S_D0, +OSD_S_D0);
334      } else {      } else {
335          if(OSD_S_Y < 0)          if(OSD_S_Y < 0)
336              y += OSD_S_AREA_H - OSD_S_PH;              py += OSD_S_AREA_H - OSD_S_PH;
337    
338          /* draw the "puller" close (>) arrow */          /* draw the "puller" close (>) arrow */
339          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);
340          cairo_rel_line_to (cr, +OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, +OSD_S_D0, +OSD_S_D0);
341          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);
342            cairo_stroke(cr);
343    
344            /* don't draw a shadow for the text content */
345            if(offset == 1) {
346                gint source;
347                g_object_get(osd->widget, "map-source", &source, NULL);
348    
349                cairo_select_font_face (cr, "Sans",
350                                        CAIRO_FONT_SLANT_NORMAL,
351                                        CAIRO_FONT_WEIGHT_BOLD);
352                cairo_set_font_size (cr, OSD_FONT_SIZE);
353    
354                int i, step = (priv->height - 2*OSD_TEXT_BORDER) /
355                    OSM_GPS_MAP_SOURCE_LAST;
356                for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {
357                    cairo_text_extents_t extents;
358                    const char *src = osm_gps_map_source_get_friendly_name(i);
359                    cairo_text_extents (cr, src, &extents);
360    
361                    int x = offset + OSD_S_PW + OSD_TEXT_BORDER;
362                    int y = offset + step * (i-1) + OSD_TEXT_BORDER;
363    
364                    /* draw filled rectangle if selected */
365                    if(source == i) {
366                        cairo_rectangle(cr, x - OSD_TEXT_BORDER/2,
367                                        y - OSD_TEXT_SKIP,
368                                        priv->width - OSD_TEXT_BORDER,
369                                        step + OSD_TEXT_SKIP);
370                        cairo_fill(cr);
371    
372                        /* temprarily draw with background color */
373    #ifndef OSD_COLOR
374                        GdkColor bg = osd->widget->style->bg[GTK_STATE_NORMAL];
375                        gdk_cairo_set_source_color(cr, &bg);
376    #else
377                        cairo_set_source_rgb (cr, OSD_COLOR_BG);
378    #endif
379                    }
380    
381                    cairo_move_to (cr, x, y + OSD_TEXT_SKIP - extents.y_bearing);
382                    cairo_show_text (cr, src);
383    
384                    /* restore color */
385                    if(source == i) {
386    #ifndef OSD_COLOR
387                        GdkColor fg = osd->widget->style->fg[GTK_STATE_NORMAL];
388                        gdk_cairo_set_source_color(cr, &fg);
389    #else
390                        cairo_set_source_rgb (cr, OSD_COLOR);
391    #endif
392                    }
393                }
394            }
395      }      }
396  }  }
397    
# Line 354  osd_render_source_sel(osm_gps_map_osd_t Line 425  osd_render_source_sel(osm_gps_map_osd_t
425  #endif  #endif
426    
427  #ifdef OSD_SHADOW_ENABLE  #ifdef OSD_SHADOW_ENABLE
     osd_source_content(priv, cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);  
428      osd_labels_shadow(cr, Z_RAD/3, TRUE);      osd_labels_shadow(cr, Z_RAD/3, TRUE);
429        osd_source_content(osd, cr, 1+OSD_LBL_SHADOW);
430        cairo_stroke (cr);
431  #endif  #endif
     osd_source_content(priv, cr, 1, 1);  
432  #ifndef OSD_COLOR  #ifndef OSD_COLOR
433      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);
434  #else  #else
435      osd_labels(cr, Z_RAD/3, TRUE);      osd_labels(cr, Z_RAD/3, TRUE);
436  #endif  #endif
437        osd_source_content(osd, cr, 1);
438        cairo_stroke (cr);
439    
440      cairo_destroy(cr);      cairo_destroy(cr);
441  }  }
442    
443    /* re-allocate the buffer used to draw the menu. This is used */
444    /* to collapse/expand the buffer */
445  static void  static void
446  osd_source_reallocate(osm_gps_map_osd_t *osd) {  osd_source_reallocate(osm_gps_map_osd_t *osd) {
447      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
448    
449      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
450      g_assert (priv->map_source);      g_assert (priv->map_source);
     cairo_surface_destroy(priv->map_source);  
451    
452      int w = OSD_S_W, h = OSD_S_H;      int w = OSD_S_W, h = OSD_S_H;
453      if(priv->expanded) {      if(priv->expanded) {
454            cairo_text_extents_t extents;
455    
456            /* determine content size */
457            cairo_t *cr = cairo_create(priv->map_source);
458            cairo_select_font_face (cr, "Sans",
459                                    CAIRO_FONT_SLANT_NORMAL,
460                                    CAIRO_FONT_WEIGHT_BOLD);
461            cairo_set_font_size (cr, OSD_FONT_SIZE);
462    
463            /* calculate menu size */
464            int i, max_h = 0, max_w = 0;
465            for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {
466                const char *src = osm_gps_map_source_get_friendly_name(i);
467                cairo_text_extents (cr, src, &extents);
468    
469                if(extents.width > max_w) max_w = extents.width;
470                if(extents.height > max_h) max_h = extents.height;
471            }
472            cairo_destroy(cr);
473    
474            priv->width  = max_w + 2*OSD_TEXT_BORDER;
475            priv->height = OSM_GPS_MAP_SOURCE_LAST *
476                (max_h + 2*OSD_TEXT_SKIP) + 2*OSD_TEXT_BORDER;
477    
478          w = OSD_S_EXP_W;          w = OSD_S_EXP_W;
479          h = OSD_S_EXP_H;          h = OSD_S_EXP_H;
480      }      }
481    
482        cairo_surface_destroy(priv->map_source);
483      priv->map_source =      priv->map_source =
484          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
485    
486      osd_render_source_sel(osd);      osd_render_source_sel(osd);
   
487  }  }
488    
489  #define OSD_HZ      15  #define OSD_HZ      15
490  #define OSD_TIME    1000  #define OSD_TIME    500
491    
492  static gboolean osd_source_animate(gpointer data) {  static gboolean osd_source_animate(gpointer data) {
493      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;
# Line 417  static gboolean osd_source_animate(gpoin Line 515  static gboolean osd_source_animate(gpoin
515    
516      /* 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 */
517    
     /* simple linear mapping */  
     //    priv->shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +  
     //        (diff * priv->count)/1000;  
   
518      /* nicer sinoid mapping */      /* nicer sinoid mapping */
519      float m = 0.5-cos(priv->count * M_PI / 1000.0)/2;      float m = 0.5-cos(priv->count * M_PI / 1000.0)/2;
520      priv->shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +      priv->shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +
# Line 461  osd_source_toggle(osm_gps_map_osd_t *osd Line 555  osd_source_toggle(osm_gps_map_osd_t *osd
555      priv->handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ, osd_source_animate, osd);      priv->handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ, osd_source_animate, osd);
556  }  }
557    
558    /* check if the user clicked inside the source selection area */
559  static osd_button_t  static osd_button_t
560  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) {
561      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
# Line 487  osd_source_check(osm_gps_map_osd_t *osd, Line 582  osd_source_check(osm_gps_map_osd_t *osd,
582              return OSD_BG;              return OSD_BG;
583          }          }
584      }      }
585    
586        /* check for clicks into data area */
587        if(priv->expanded && !priv->handler_id) {
588            /* re-adjust from puller top to content top */
589            if(OSD_S_Y < 0)
590                y += OSD_S_EXP_H - OSD_S_PH;
591    
592            if(x > OSD_S_PW &&
593               x < OSD_S_PW + OSD_S_EXP_W &&
594               y > 0 &&
595               y < OSD_S_EXP_H) {
596    
597                int step = (priv->height - 2*OSD_TEXT_BORDER)
598                    / OSM_GPS_MAP_SOURCE_LAST;
599    
600                y -= OSD_TEXT_BORDER - OSD_TEXT_SKIP;
601                y /= step;
602                y += 1;
603    
604                gint old = 0;
605                g_object_get(osd->widget, "map-source", &old, NULL);
606    
607                if(y > OSM_GPS_MAP_SOURCE_NULL &&
608                   y <= OSM_GPS_MAP_SOURCE_LAST &&
609                   old != y) {
610                    g_object_set(osd->widget, "map-source", y, NULL);
611    
612                    osd_render_source_sel(osd);
613                    osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
614                }
615    
616                /* return "clicked in OSD background" to prevent further */
617                /* processing by application */
618                return OSD_BG;
619            }
620        }
621    
622      return OSD_NONE;      return OSD_NONE;
623  }  }
624    #endif // OSD_SOURCE_SEL
625    
626  static osd_button_t  static osd_button_t
627  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 727  osd_zoom_labels(cairo_t *cr, gint x, gin
727      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);
728  }  }
729    
730    static char *
731    dist_str_metric(int dist)
732    {
733        if(dist<1000)
734            return g_strdup_printf("%u m",  dist);
735    
736        return g_strdup_printf("%u km", dist/1000);
737    }
738    
739  static void  static void
740  osd_render(osm_gps_map_osd_t *osd) {  osd_render_scale(osm_gps_map_osd_t *osd)
741    {
742        osd_priv_t *priv = (osd_priv_t*)osd->priv;
743        float m_per_pix = osm_gps_map_get_scale(OSM_GPS_MAP(osd->widget));
744    
745        /* first fill with transparency */
746        cairo_t *cr = cairo_create(priv->scale);
747        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
748        cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
749        //    cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);
750        cairo_paint(cr);
751        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
752    
753        /* determine the size of the scale width in meters */
754        float width = (OSD_SCALE_W-2) * m_per_pix;
755        printf("width = %f meters\n", width);
756    
757        /* scale this to useful values */
758        int exp = logf(width)*M_LOG10E;
759        int mant = width/pow(10,exp);
760        printf("mant = %d, exp = %d \n", mant, exp);
761    
762        int width_metric = mant * pow(10,exp);
763        char *dist_str = dist_str_metric(width_metric);
764        width_metric /= m_per_pix;
765        printf("metric scale width = %d pixels: %s\n", width_metric, dist_str);
766    
767        int font_size = 12;
768    
769        cairo_select_font_face (cr, "Sans",
770                                CAIRO_FONT_SLANT_NORMAL,
771                                CAIRO_FONT_WEIGHT_BOLD);
772        cairo_set_font_size (cr, font_size);
773        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 1.0);
774    
775        cairo_text_extents_t extents;
776        cairo_text_extents (cr, dist_str, &extents);
777    
778        cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
779        cairo_move_to (cr, font_size/3, font_size);
780        cairo_text_path (cr, dist_str);
781        cairo_set_line_width (cr, 2);
782        cairo_stroke (cr);
783    
784        cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
785        cairo_move_to (cr, font_size/3, font_size);
786        cairo_show_text (cr, dist_str);
787    
788        /* draw white line */
789        cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
790        cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 1.0);
791        cairo_set_line_width (cr, 4);
792        cairo_move_to (cr, 2, 2*font_size/3);
793        cairo_rel_line_to (cr, 0,  2*font_size/3);
794        cairo_rel_line_to (cr, width_metric, 0);
795        cairo_rel_line_to (cr, 0, -2*font_size/3);
796        cairo_stroke(cr);
797    
798        /* draw black line */
799        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 1.0);
800        cairo_set_line_width (cr, 2);
801        cairo_move_to (cr, 2, 2*font_size/3);
802        cairo_rel_line_to (cr, 0,  2*font_size/3);
803        cairo_rel_line_to (cr, width_metric, 0);
804        cairo_rel_line_to (cr, 0, -2*font_size/3);
805        cairo_stroke(cr);
806    
807        /* xyz */
808    
809        cairo_destroy(cr);
810    }
811    
812    static void
813    osd_render(osm_gps_map_osd_t *osd)
814    {
815      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
816    
817  #ifndef OSD_COLOR  #ifndef OSD_COLOR
# Line 641  osd_render(osm_gps_map_osd_t *osd) { Line 857  osd_render(osm_gps_map_osd_t *osd) {
857      /* --------- draw zoom and dpad labels --------- */      /* --------- draw zoom and dpad labels --------- */
858    
859  #ifdef OSD_SHADOW_ENABLE  #ifdef OSD_SHADOW_ENABLE
860        osd_labels_shadow(cr, Z_RAD/3, TRUE);
861      osd_zoom_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);      osd_zoom_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);
862  #ifndef OSD_NO_DPAD  #ifndef OSD_NO_DPAD
863      osd_dpad_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);      osd_dpad_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);
864  #endif  #endif
865      osd_labels_shadow(cr, Z_RAD/3, TRUE);      cairo_stroke(cr);
866  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
     osd_dpad_gps(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);  
867      osd_labels_shadow(cr, Z_RAD/6, osd->cb != NULL);      osd_labels_shadow(cr, Z_RAD/6, osd->cb != NULL);
868        osd_dpad_gps(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);
869        cairo_stroke(cr);
870  #endif  #endif
871  #endif  #endif
872    
     osd_zoom_labels(cr, 1, 1);  
 #ifndef OSD_NO_DPAD  
     osd_dpad_labels(cr, 1, 1);  
 #endif  
873  #ifndef OSD_COLOR  #ifndef OSD_COLOR
874      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);
875  #else  #else
876      osd_labels(cr, Z_RAD/3, TRUE);      osd_labels(cr, Z_RAD/3, TRUE);
877  #endif  #endif
878  #ifdef OSD_GPS_BUTTON      osd_zoom_labels(cr, 1, 1);
879      osd_dpad_gps(cr, 1, 1);  #ifndef OSD_NO_DPAD
880        osd_dpad_labels(cr, 1, 1);
881    #endif
882        cairo_stroke(cr);
883    
884  #ifndef OSD_COLOR  #ifndef OSD_COLOR
885      osd_labels(cr, Z_RAD/6, osd->cb != NULL, &fg, &da);      osd_labels(cr, Z_RAD/6, osd->cb != NULL, &fg, &da);
886  #else  #else
887      osd_labels(cr, Z_RAD/6, osd->cb != NULL);      osd_labels(cr, Z_RAD/6, osd->cb != NULL);
888  #endif  #endif
889    #ifdef OSD_GPS_BUTTON
890        osd_dpad_gps(cr, 1, 1);
891  #endif  #endif
892        cairo_stroke(cr);
893    
894      cairo_destroy(cr);      cairo_destroy(cr);
895    
896    #ifdef OSD_SOURCE_SEL
897      osd_render_source_sel(osd);      osd_render_source_sel(osd);
898    #endif
899    
900    #ifdef OSD_SCALE
901        osd_render_scale(osd);
902    #endif
903  }  }
904    
905  static void  static void
# Line 687  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 914  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
914          priv->overlay =          priv->overlay =
915              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);
916    
917    #ifdef OSD_SOURCE_SEL
918          /* the initial OSD state is alway not-expanded */          /* the initial OSD state is alway not-expanded */
919          priv->map_source =          priv->map_source =
920              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
921                                             OSD_S_W+2, OSD_S_H+2);                                             OSD_S_W+2, OSD_S_H+2);
922    #endif
923    
924    #ifdef OSD_SCALE
925            priv->scale =
926                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
927                                           OSD_SCALE_W+2, OSD_SCALE_H+2);
928    #endif
929    
930          /* ... and render it */          /* ... and render it */
931          osd_render(osd);          osd_render(osd);
# Line 731  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 966  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
966      cairo_paint(cr);      cairo_paint(cr);
967  #endif  #endif
968    
969    #ifdef OSD_SCALE
970        x =  OSD_X;
971        y = -OSD_Y;
972        if(x < 0) x += osd->widget->allocation.width - OSD_SCALE_W;
973        if(y < 0) y += osd->widget->allocation.height - OSD_SCALE_H;
974    
975        cairo_set_source_surface(cr, priv->scale, x, y);
976        cairo_paint(cr);
977    #endif
978    
979      cairo_destroy(cr);      cairo_destroy(cr);
980  }  }
981    
# Line 739  osd_free(osm_gps_map_osd_t *osd) Line 984  osd_free(osm_gps_map_osd_t *osd)
984  {  {
985      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
986    
     if(priv->handler_id)  
         gtk_timeout_remove(priv->handler_id);  
   
987      if (priv->overlay)      if (priv->overlay)
988           cairo_surface_destroy(priv->overlay);           cairo_surface_destroy(priv->overlay);
989    
990    #ifdef OSD_SOURCE_SEL
991        if(priv->handler_id)
992            gtk_timeout_remove(priv->handler_id);
993    
994      if (priv->map_source)      if (priv->map_source)
995           cairo_surface_destroy(priv->map_source);           cairo_surface_destroy(priv->map_source);
996    #endif
997    
998    #ifdef OSD_SCALE
999        if (priv->scale)
1000             cairo_surface_destroy(priv->scale);
1001    #endif
1002    
1003      g_free(priv);      g_free(priv);
1004  }  }
1005    
1006    static gboolean
1007    osd_busy(osm_gps_map_osd_t *osd)
1008    {
1009    #ifdef OSD_SOURCE_SEL
1010        osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1011        return (priv->handler_id != 0);
1012    #else
1013        return FALSE;
1014    #endif
1015    }
1016    
1017  static osm_gps_map_osd_t osd_classic = {  static osm_gps_map_osd_t osd_classic = {
1018        .widget     = NULL,
1019    
1020      .draw       = osd_draw,      .draw       = osd_draw,
1021      .check      = osd_check,      .check      = osd_check,
1022      .render     = osd_render,      .render     = osd_render,
1023      .free       = osd_free,      .free       = osd_free,
1024        .busy       = osd_busy,
1025    
1026      .cb         = NULL,      .cb         = NULL,
1027      .data       = NULL,      .data       = NULL,
Legend:
Removed from v.86  
changed lines
  Added in v.100