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 98 by harbaum, Mon Sep 7 13:20:37 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  100
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            /* ... and right of it the waypoint id */
455            cairo_text_extents_t extents;
456    
457            /* determine content size */
458            cairo_t *cr = cairo_create(priv->map_source);
459            cairo_select_font_face (cr, "Sans",
460                                    CAIRO_FONT_SLANT_NORMAL,
461                                    CAIRO_FONT_WEIGHT_BOLD);
462            cairo_set_font_size (cr, OSD_FONT_SIZE);
463    
464            /* calculate menu size */
465            int i, max_h = 0, max_w = 0;
466            for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {
467                const char *src = osm_gps_map_source_get_friendly_name(i);
468                cairo_text_extents (cr, src, &extents);
469    
470                if(extents.width > max_w) max_w = extents.width;
471                if(extents.height > max_h) max_h = extents.height;
472            }
473            cairo_destroy(cr);
474    
475            priv->width  = max_w + 2*OSD_TEXT_BORDER;
476            priv->height = OSM_GPS_MAP_SOURCE_LAST *
477                (max_h + 2*OSD_TEXT_SKIP) + 2*OSD_TEXT_BORDER;
478    
479          w = OSD_S_EXP_W;          w = OSD_S_EXP_W;
480          h = OSD_S_EXP_H;          h = OSD_S_EXP_H;
481      }      }
482    
483        cairo_surface_destroy(priv->map_source);
484      priv->map_source =      priv->map_source =
485          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
486    
487      osd_render_source_sel(osd);      osd_render_source_sel(osd);
   
488  }  }
489    
490  #define OSD_HZ      15  #define OSD_HZ      15
491  #define OSD_TIME    1000  #define OSD_TIME    500
492    
493  static gboolean osd_source_animate(gpointer data) {  static gboolean osd_source_animate(gpointer data) {
494      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 516  static gboolean osd_source_animate(gpoin
516    
517      /* 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 */
518    
     /* simple linear mapping */  
     //    priv->shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +  
     //        (diff * priv->count)/1000;  
   
519      /* nicer sinoid mapping */      /* nicer sinoid mapping */
520      float m = 0.5-cos(priv->count * M_PI / 1000.0)/2;      float m = 0.5-cos(priv->count * M_PI / 1000.0)/2;
521      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 556  osd_source_toggle(osm_gps_map_osd_t *osd
556      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);
557  }  }
558    
559    /* check if the user clicked inside the source selection area */
560  static osd_button_t  static osd_button_t
561  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) {
562      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 583  osd_source_check(osm_gps_map_osd_t *osd,
583              return OSD_BG;              return OSD_BG;
584          }          }
585      }      }
586    
587        /* check for clicks into data area */
588        if(priv->expanded && !priv->handler_id) {
589            /* re-adjust from puller top to content top */
590            if(OSD_S_Y < 0)
591                y += OSD_S_EXP_H - OSD_S_PH;
592    
593            if(x > OSD_S_PW &&
594               x < OSD_S_PW + OSD_S_EXP_W &&
595               y > 0 &&
596               y < OSD_S_EXP_H) {
597    
598                int step = (priv->height - 2*OSD_TEXT_BORDER)
599                    / OSM_GPS_MAP_SOURCE_LAST;
600    
601                y -= OSD_TEXT_BORDER - OSD_TEXT_SKIP;
602                y /= step;
603                y += 1;
604    
605                gint old = 0;
606                g_object_get(osd->widget, "map-source", &old, NULL);
607    
608                if(y > OSM_GPS_MAP_SOURCE_NULL &&
609                   y <= OSM_GPS_MAP_SOURCE_LAST &&
610                   old != y) {
611                    g_object_set(osd->widget, "map-source", y, NULL);
612    
613                    osd_render_source_sel(osd);
614                    osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
615                }
616    
617                /* return "clicked in OSD background" to prevent further */
618                /* processing by application */
619                return OSD_BG;
620            }
621        }
622    
623      return OSD_NONE;      return OSD_NONE;
624  }  }
625    #endif // OSD_SOURCE_SEL
626    
627  static osd_button_t  static osd_button_t
628  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 728  osd_zoom_labels(cairo_t *cr, gint x, gin
728      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);      cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);
729  }  }
730    
731    static float pixel2m(OsmGpsMap *map, int pixel) {
732      return pixel*osm_gps_map_get_scale(OSM_GPS_MAP(map));
733    }
734    
735  static void  static void
736  osd_render(osm_gps_map_osd_t *osd) {  osd_render_scale(osm_gps_map_osd_t *osd)
737    {
738        osd_priv_t *priv = (osd_priv_t*)osd->priv;
739    
740        /* first fill with transparency */
741        cairo_t *cr = cairo_create(priv->scale);
742        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
743        //    cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
744        cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);
745        cairo_paint(cr);
746        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
747    
748        /* determine the size of the scale width in meters */
749        float width = pixel2m(OSM_GPS_MAP(osd->widget), OSD_SCALE_W);
750        printf("width = %f meters\n", width);
751    
752        /* scale this to useful values */
753        int exp = logf(width)*M_LOG10E;
754        int mant = width/pow(10,exp);
755        printf("mant = %d, exp = %d \n", mant, exp);
756    
757        cairo_destroy(cr);
758    }
759    
760    static void
761    osd_render(osm_gps_map_osd_t *osd)
762    {
763      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
764    
765  #ifndef OSD_COLOR  #ifndef OSD_COLOR
# Line 641  osd_render(osm_gps_map_osd_t *osd) { Line 805  osd_render(osm_gps_map_osd_t *osd) {
805      /* --------- draw zoom and dpad labels --------- */      /* --------- draw zoom and dpad labels --------- */
806    
807  #ifdef OSD_SHADOW_ENABLE  #ifdef OSD_SHADOW_ENABLE
808        osd_labels_shadow(cr, Z_RAD/3, TRUE);
809      osd_zoom_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);      osd_zoom_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);
810  #ifndef OSD_NO_DPAD  #ifndef OSD_NO_DPAD
811      osd_dpad_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);      osd_dpad_labels(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);
812  #endif  #endif
813      osd_labels_shadow(cr, Z_RAD/3, TRUE);      cairo_stroke(cr);
814  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
     osd_dpad_gps(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);  
815      osd_labels_shadow(cr, Z_RAD/6, osd->cb != NULL);      osd_labels_shadow(cr, Z_RAD/6, osd->cb != NULL);
816        osd_dpad_gps(cr, 1+OSD_LBL_SHADOW, 1+OSD_LBL_SHADOW);
817        cairo_stroke(cr);
818  #endif  #endif
819  #endif  #endif
820    
     osd_zoom_labels(cr, 1, 1);  
 #ifndef OSD_NO_DPAD  
     osd_dpad_labels(cr, 1, 1);  
 #endif  
821  #ifndef OSD_COLOR  #ifndef OSD_COLOR
822      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);      osd_labels(cr, Z_RAD/3, TRUE, &fg, &da);
823  #else  #else
824      osd_labels(cr, Z_RAD/3, TRUE);      osd_labels(cr, Z_RAD/3, TRUE);
825  #endif  #endif
826  #ifdef OSD_GPS_BUTTON      osd_zoom_labels(cr, 1, 1);
827      osd_dpad_gps(cr, 1, 1);  #ifndef OSD_NO_DPAD
828        osd_dpad_labels(cr, 1, 1);
829    #endif
830        cairo_stroke(cr);
831    
832  #ifndef OSD_COLOR  #ifndef OSD_COLOR
833      osd_labels(cr, Z_RAD/6, osd->cb != NULL, &fg, &da);      osd_labels(cr, Z_RAD/6, osd->cb != NULL, &fg, &da);
834  #else  #else
835      osd_labels(cr, Z_RAD/6, osd->cb != NULL);      osd_labels(cr, Z_RAD/6, osd->cb != NULL);
836  #endif  #endif
837    #ifdef OSD_GPS_BUTTON
838        osd_dpad_gps(cr, 1, 1);
839  #endif  #endif
840        cairo_stroke(cr);
841    
842      cairo_destroy(cr);      cairo_destroy(cr);
843    
844    #ifdef OSD_SOURCE_SEL
845      osd_render_source_sel(osd);      osd_render_source_sel(osd);
846    #endif
847    
848    #ifdef OSD_SCALE
849        osd_render_scale(osd);
850    #endif
851  }  }
852    
853  static void  static void
# Line 687  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 862  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
862          priv->overlay =          priv->overlay =
863              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);
864    
865    #ifdef OSD_SOURCE_SEL
866          /* the initial OSD state is alway not-expanded */          /* the initial OSD state is alway not-expanded */
867          priv->map_source =          priv->map_source =
868              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
869                                             OSD_S_W+2, OSD_S_H+2);                                             OSD_S_W+2, OSD_S_H+2);
870    #endif
871    
872    #ifdef OSD_SCALE
873            priv->scale =
874                cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
875                                           OSD_SCALE_W, OSD_SCALE_H);
876    #endif
877    
878          /* ... and render it */          /* ... and render it */
879          osd_render(osd);          osd_render(osd);
# Line 731  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 914  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
914      cairo_paint(cr);      cairo_paint(cr);
915  #endif  #endif
916    
917    #ifdef OSD_SCALE
918        x =  OSD_X;
919        y = -OSD_Y;
920        if(x < 0) x += osd->widget->allocation.width - OSD_SCALE_W;
921        if(y < 0) y += osd->widget->allocation.height - OSD_SCALE_H;
922    
923        cairo_set_source_surface(cr, priv->scale, x, y);
924        cairo_paint(cr);
925    #endif
926    
927      cairo_destroy(cr);      cairo_destroy(cr);
928  }  }
929    
# Line 739  osd_free(osm_gps_map_osd_t *osd) Line 932  osd_free(osm_gps_map_osd_t *osd)
932  {  {
933      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
934    
     if(priv->handler_id)  
         gtk_timeout_remove(priv->handler_id);  
   
935      if (priv->overlay)      if (priv->overlay)
936           cairo_surface_destroy(priv->overlay);           cairo_surface_destroy(priv->overlay);
937    
938    #ifdef OSD_SOURCE_SEL
939        if(priv->handler_id)
940            gtk_timeout_remove(priv->handler_id);
941    
942      if (priv->map_source)      if (priv->map_source)
943           cairo_surface_destroy(priv->map_source);           cairo_surface_destroy(priv->map_source);
944    #endif
945    
946    #ifdef OSD_SCALE
947        if (priv->scale)
948             cairo_surface_destroy(priv->scale);
949    #endif
950    
951      g_free(priv);      g_free(priv);
952  }  }
953    
954    static gboolean
955    osd_busy(osm_gps_map_osd_t *osd)
956    {
957    #ifdef OSD_SOURCE_SEL
958        osd_priv_t *priv = (osd_priv_t *)(osd->priv);
959        return (priv->handler_id != 0);
960    #else
961        return FALSE;
962    #endif
963    }
964    
965  static osm_gps_map_osd_t osd_classic = {  static osm_gps_map_osd_t osd_classic = {
966        .widget     = NULL,
967    
968      .draw       = osd_draw,      .draw       = osd_draw,
969      .check      = osd_check,      .check      = osd_check,
970      .render     = osd_render,      .render     = osd_render,
971      .free       = osd_free,      .free       = osd_free,
972        .busy       = osd_busy,
973    
974      .cb         = NULL,      .cb         = NULL,
975      .data       = NULL,      .data       = NULL,
Legend:
Removed from v.86  
changed lines
  Added in v.98