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

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

revision 88 by harbaum, Mon Aug 31 14:22:28 2009 UTC revision 98 by harbaum, Mon Sep 7 13:20:37 2009 UTC
# Line 25  Line 25 
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 39  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  #ifdef OSD_SOURCE_SEL
52      /* values to handle the "source" menu */      /* values to handle the "source" menu */
53      cairo_surface_t *map_source;      cairo_surface_t *map_source;
# Line 342  osd_source_content(osm_gps_map_osd_t *os Line 351  osd_source_content(osm_gps_map_osd_t *os
351                                      CAIRO_FONT_WEIGHT_BOLD);                                      CAIRO_FONT_WEIGHT_BOLD);
352              cairo_set_font_size (cr, OSD_FONT_SIZE);              cairo_set_font_size (cr, OSD_FONT_SIZE);
353    
354              int i, step = (priv->height - 2*OSD_TEXT_BORDER)              int i, step = (priv->height - 2*OSD_TEXT_BORDER) /
355                  / OSM_GPS_MAP_SOURCE_LAST;                  OSM_GPS_MAP_SOURCE_LAST;
356              for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {              for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {
357                  cairo_text_extents_t extents;                  cairo_text_extents_t extents;
358                  const char *src = osm_gps_map_source_get_friendly_name(i);                  const char *src = osm_gps_map_source_get_friendly_name(i);
# Line 431  osd_render_source_sel(osm_gps_map_osd_t Line 440  osd_render_source_sel(osm_gps_map_osd_t
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;
# Line 456  osd_source_reallocate(osm_gps_map_osd_t Line 467  osd_source_reallocate(osm_gps_map_osd_t
467              const char *src = osm_gps_map_source_get_friendly_name(i);              const char *src = osm_gps_map_source_get_friendly_name(i);
468              cairo_text_extents (cr, src, &extents);              cairo_text_extents (cr, src, &extents);
469    
             //            printf("Source %d: %s = %f %f\n", i, src,  
             //                   extents.width, extents.height);  
   
470              if(extents.width > max_w) max_w = extents.width;              if(extents.width > max_w) max_w = extents.width;
471              if(extents.height > max_h) max_h = extents.height;              if(extents.height > max_h) max_h = extents.height;
472          }          }
# Line 477  osd_source_reallocate(osm_gps_map_osd_t Line 485  osd_source_reallocate(osm_gps_map_osd_t
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
# Line 509  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 553  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 581  osd_source_check(osm_gps_map_osd_t *osd, Line 585  osd_source_check(osm_gps_map_osd_t *osd,
585      }      }
586    
587      /* check for clicks into data area */      /* check for clicks into data area */
588      if(priv->expanded) {      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 &&          if(x > OSD_S_PW &&
594             x < OSD_S_PW + OSD_S_EXP_W &&             x < OSD_S_PW + OSD_S_EXP_W &&
595             y > 0 &&             y > 0 &&
596             y < OSD_S_EXP_H) {             y < OSD_S_EXP_H) {
597    
598                int step = (priv->height - 2*OSD_TEXT_BORDER)
599                    / OSM_GPS_MAP_SOURCE_LAST;
600    
601              printf("in OSD source menu area\n");              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;              return OSD_BG;
620          }          }
621      }      }
# Line 701  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 787  osd_render(osm_gps_map_osd_t *osd) { Line 844  osd_render(osm_gps_map_osd_t *osd) {
844  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
845      osd_render_source_sel(osd);      osd_render_source_sel(osd);
846  #endif  #endif
847    
848    #ifdef OSD_SCALE
849        osd_render_scale(osd);
850    #endif
851  }  }
852    
853  static void  static void
# Line 808  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 869  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
869                                             OSD_S_W+2, OSD_S_H+2);                                             OSD_S_W+2, OSD_S_H+2);
870  #endif  #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);
880      }      }
# Line 847  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 866  osd_free(osm_gps_map_osd_t *osd) Line 943  osd_free(osm_gps_map_osd_t *osd)
943           cairo_surface_destroy(priv->map_source);           cairo_surface_destroy(priv->map_source);
944  #endif  #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    
Legend:
Removed from v.88  
changed lines
  Added in v.98