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

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

revision 63 by harbaum, Wed Aug 19 12:35:25 2009 UTC revision 74 by harbaum, Mon Aug 24 09:23:36 2009 UTC
# Line 98  struct _OsmGpsMapPrivate Line 98  struct _OsmGpsMapPrivate
98      coord_t *gps;      coord_t *gps;
99      gboolean gps_valid;      gboolean gps_valid;
100    
101    #ifdef ENABLE_BALLOON
102      //a balloon with additional info      //a balloon with additional info
103      struct {      struct {
104          coord_t *coo;          coord_t *coo;
# Line 106  struct _OsmGpsMapPrivate Line 107  struct _OsmGpsMapPrivate
107          OsmGpsMapBalloonCallback cb;          OsmGpsMapBalloonCallback cb;
108          gpointer data;          gpointer data;
109      } balloon;      } balloon;
110    #endif
111    
112  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
113      //the osd controls      //the osd controls (if present)
114      struct {      osm_gps_map_osd_t *osd;
         GdkPixmap *backup;  
         gint backup_x, backup_y;  
         //        GdkPixbuf *pixbuf;  
     } osd;  
115  #endif  #endif
116    
117      //additional images or tracks added to the map      //additional images or tracks added to the map
118      GSList *tracks;      GSList *tracks;
119      GSList *images;      GSList *images;
# Line 651  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 649  osm_gps_map_draw_gps_point (OsmGpsMap *m
649      }      }
650  }  }
651    
652    #ifdef ENABLE_BALLOON
653  /* most visual effects are hardcoded by now, but may be made */  /* most visual effects are hardcoded by now, but may be made */
654  /* available via properties later */  /* available via properties later */
655    #ifndef BALLOON_AREA_WIDTH
656  #define BALLOON_AREA_WIDTH           290  #define BALLOON_AREA_WIDTH           290
657    #endif
658    #ifndef BALLOON_AREA_HEIGHT
659  #define BALLOON_AREA_HEIGHT           75  #define BALLOON_AREA_HEIGHT           75
660    #endif
661    #ifndef BALLOON_CORNER_RADIUS
662    #define BALLOON_CORNER_RADIUS         10
663    #endif
664    
665  #define BALLOON_CORNER_RADIUS         20  #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
 #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/4)  
666  #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)  #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
667  #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)  #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
668  #define BALLOON_TRANSPARENCY         0.8  #define BALLOON_TRANSPARENCY         0.8
669  #define POINTER_HEIGHT                20  #define POINTER_HEIGHT                20
670  #define POINTER_FOOT_WIDTH            20  #define POINTER_FOOT_WIDTH            20
671  #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)  #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
672  #define BALLOON_SHADOW                5  #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
673  #define BALLOON_SHADOW_TRANSPARENCY  0.2  #define BALLOON_SHADOW_TRANSPARENCY  0.2
674    
675  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS/3)  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
676    
677    
678  /* draw the bubble shape. this is used twice, once for the shape and once */  /* draw the bubble shape. this is used twice, once for the shape and once */
# Line 677  osm_gps_map_draw_balloon_shape (cairo_t Line 682  osm_gps_map_draw_balloon_shape (cairo_t
682         gboolean bottom, int px, int py, int px0, int px1) {         gboolean bottom, int px, int py, int px0, int px1) {
683    
684      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
685      cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + BALLOON_CORNER_RADIUS, y0);      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
686                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
687      if(!bottom) {      if(!bottom) {
688          /* insert top pointer */          /* insert top pointer */
689          cairo_line_to (cr, px1, y0);          cairo_line_to (cr, px1, y0);
# Line 686  osm_gps_map_draw_balloon_shape (cairo_t Line 692  osm_gps_map_draw_balloon_shape (cairo_t
692      }      }
693    
694      cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);      cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
695      cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + BALLOON_CORNER_RADIUS);      cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
696                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
697      cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);      cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
698      cairo_curve_to (cr, x1, y1, x1, y1, x1 - BALLOON_CORNER_RADIUS, y1);      cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
699                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
700      if(bottom) {      if(bottom) {
701          /* insert bottom pointer */          /* insert bottom pointer */
702          cairo_line_to (cr, px0, y1);          cairo_line_to (cr, px0, y1);
# Line 697  osm_gps_map_draw_balloon_shape (cairo_t Line 705  osm_gps_map_draw_balloon_shape (cairo_t
705      }      }
706    
707      cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);      cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
708      cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - BALLOON_CORNER_RADIUS);      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
709                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
710    
711      cairo_close_path (cr);      cairo_close_path (cr);
712  }  }
# Line 788  osm_gps_map_draw_balloon_int (OsmGpsMap Line 797  osm_gps_map_draw_balloon_int (OsmGpsMap
797          cairo_stroke(cr);          cairo_stroke(cr);
798    
799          cairo_set_source_rgba (cr, 1, 1, 1, 1.0);          cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
800          cairo_set_line_width (cr, 3);          cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);
801          cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);          cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
802          cairo_move_to (cr, cx - crad/2, cy - crad/2);          cairo_move_to (cr, cx - crad/2, cy - crad/2);
803          cairo_line_to (cr, cx + crad/2, cy + crad/2);          cairo_line_to (cr, cx + crad/2, cy + crad/2);
# Line 850  osm_gps_map_in_balloon(OsmGpsMapPrivate Line 859  osm_gps_map_in_balloon(OsmGpsMapPrivate
859              (y > priv->balloon.rect.y) &&              (y > priv->balloon.rect.y) &&
860              (y < priv->balloon.rect.y + priv->balloon.rect.h));              (y < priv->balloon.rect.y + priv->balloon.rect.h));
861  }  }
862    #endif // ENABLE_BALLOON
863    
864  static void  static void
865  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
# Line 1407  osm_gps_map_purge_cache (OsmGpsMap *map) Line 1417  osm_gps_map_purge_cache (OsmGpsMap *map)
1417     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);
1418  }  }
1419    
 #ifdef ENABLE_OSD  
 /* position and extent of bounding box */  
 #define OSD_X      (10)  
 #define OSD_Y      (10)  
   
 #define OSD_COLOR  0.5, 0.5, 1  
   
 /* parameters of the direction shape */  
 #define D_RAD  (20)         // diameter of dpad  
 #define D_TIP  (4*D_RAD/5)  // distance of arrow tip from dpad center  
 #define D_LEN  (D_RAD/4)    // length of arrow  
 #define D_WID  (D_LEN)      // width of arrow  
   
 /* parameters of the "zoom" pad */  
 #define Z_STEP   (-D_RAD/8) // distance between dpad and zoom  
 #define Z_RAD    (D_RAD/2)  // radius of "caps" of zoom bar  
   
 /* shadow also depends on control size */  
 #define OSD_SHADOW (D_RAD/8)  
   
 /* total width and height of controls incl. shadow */  
 #define OSD_W    (2*D_RAD + OSD_SHADOW)  
 #define OSD_H    (2*D_RAD + Z_STEP + 2*Z_RAD + OSD_SHADOW)  
   
 #define OSD_LBL_SHADOW (OSD_SHADOW/2)  
   
 #define Z_TOP    (2 * D_RAD + Z_STEP)  
 #define Z_MID    (Z_TOP + Z_RAD)  
 #define Z_BOT    (Z_MID + Z_RAD)  
 #define Z_LEFT   (Z_RAD)  
 #define Z_RIGHT  (2 * D_RAD - Z_RAD)  
   
 /* create the cairo shape used for the zoom buttons */  
 static void  
 osm_gps_map_osd_zoom_shape(cairo_t *cr, gint x, gint y) {  
     cairo_move_to (cr, x+Z_LEFT,    y+Z_TOP);  
     cairo_line_to (cr, x+Z_RIGHT,   y+Z_TOP);  
     cairo_arc     (cr, x+Z_RIGHT,   y+Z_MID, Z_RAD, -M_PI/2,  M_PI/2);  
     cairo_line_to (cr, x+Z_LEFT,    y+Z_BOT);  
     cairo_arc     (cr, x+Z_LEFT,    y+Z_MID, Z_RAD,  M_PI/2, -M_PI/2);  
 }  
   
 /* create the cairo shape used for the dpad */  
 static void  
 osm_gps_map_osd_dpad_shape(cairo_t *cr, gint x, gint y) {  
     cairo_arc (cr, x+D_RAD, y+D_RAD, D_RAD, 0, 2 * M_PI);  
 }  
   
 typedef enum {  
     OSD_NONE = 0,  
     OSD_BG,  
     OSD_UP,  
     OSD_DOWN,  
     OSD_LEFT,  
     OSD_RIGHT,  
     OSD_IN,  
     OSD_OUT,  
     OSD_GPS  
 } osd_button_t;  
   
 static gboolean  
 osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)  
 {  
     return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);  
 }  
   
 /* check whether x/y is within the dpad */  
 static osd_button_t  
 osm_gps_map_osd_check_dpad(gint x, gint y)  
 {  
     /* within entire dpad circle */  
     if( osm_gps_map_in_circle(x, y, OSD_X + D_RAD, OSD_Y + D_RAD, D_RAD))  
     {  
         /* convert into position relative to dpads centre */  
         x -= (OSD_X + D_RAD);  
         y -= (OSD_Y + D_RAD);  
   
         /* check for dpad center goes here! */  
         if( osm_gps_map_in_circle(x, y, OSD_X + D_RAD, OSD_Y + D_RAD, D_RAD/3))  
             return OSD_GPS;  
   
         if( y < 0 && abs(x) < abs(y))  
             return OSD_UP;  
   
         if( y > 0 && abs(x) < abs(y))  
             return OSD_DOWN;  
   
         if( x < 0 && abs(y) < abs(x))  
             return OSD_LEFT;  
   
         if( x > 0 && abs(y) < abs(x))  
             return OSD_RIGHT;  
   
         return OSD_BG;  
     }  
     return OSD_NONE;  
 }  
   
 /* check whether x/y is within the zoom pads */  
 static osd_button_t  
 osm_gps_map_osd_check_zoom(gint x, gint y) {  
     if( x > OSD_X && x < (OSD_X + OSD_W) && y > Z_TOP && y < Z_BOT) {  
   
         /* within circle around (-) label */  
         if( osm_gps_map_in_circle(x, y, OSD_X + Z_LEFT, OSD_Y + Z_MID, Z_RAD))  
             return OSD_OUT;  
   
         /* between center of (-) button and center of entire zoom control area */  
         if(x > OSD_LEFT && x < OSD_X + D_RAD)  
             return OSD_OUT;  
   
         /* within circle around (+) label */  
         if( osm_gps_map_in_circle(x, y, OSD_X + Z_RIGHT, OSD_Y + Z_MID, Z_RAD))  
             return OSD_IN;  
   
         /* between center of (+) button and center of entire zoom control area */  
         if(x < OSD_RIGHT && x > OSD_X + D_RAD)  
             return OSD_IN;  
     }  
   
     return OSD_NONE;  
 }  
   
 static osd_button_t  
 osm_gps_map_osd_check(gint x, gint y) {  
     osd_button_t but = OSD_NONE;  
   
     /* first do a rough test for the OSD area. */  
     /* this is just to avoid an unnecessary detailed test */  
     if(x > OSD_X && x < OSD_X + OSD_W &&  
        y > OSD_Y && y < OSD_Y + OSD_H) {  
   
         but = osm_gps_map_osd_check_dpad(x, y);  
   
         if(but == OSD_NONE)  
             but = osm_gps_map_osd_check_zoom(x, y);  
     }  
   
     return but;  
 }  
   
 static void  
 osm_gps_map_osd_shape_shadow(cairo_t *cr) {  
     cairo_set_source_rgba (cr, 0, 0, 0, 0.2);  
     cairo_fill (cr);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_shape(cairo_t *cr) {  
     cairo_set_source_rgb (cr, 1, 1, 1);  
     cairo_fill_preserve (cr);  
     cairo_set_source_rgb (cr, OSD_COLOR);  
     cairo_set_line_width (cr, 1);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_dpad_labels(cairo_t *cr, gint x, gint y) {  
     /* move reference to dpad center */  
     x += D_RAD;  
     y += D_RAD;  
   
     const static gint offset[][3][2] = {  
         /* left arrow/triangle */  
         { { -D_TIP+D_LEN, -D_WID }, { -D_LEN, D_WID }, { +D_LEN, D_WID } },  
         /* right arrow/triangle */  
         { { +D_TIP-D_LEN, -D_WID }, { +D_LEN, D_WID }, { -D_LEN, D_WID } },  
         /* top arrow/triangle */  
         { { -D_WID, -D_TIP+D_LEN }, { D_WID, -D_LEN }, { D_WID, +D_LEN } },  
         /* bottom arrow/triangle */  
         { { -D_WID, +D_TIP-D_LEN }, { D_WID, +D_LEN }, { D_WID, -D_LEN } }  
     };  
   
     int i;  
     for(i=0;i<4;i++) {  
         cairo_move_to (cr, x + offset[i][0][0], y + offset[i][0][1]);  
         cairo_rel_line_to (cr, offset[i][1][0], offset[i][1][1]);  
         cairo_rel_line_to (cr, offset[i][2][0], offset[i][2][1]);  
     }  
 }  
   
 /* draw the sattelite dish icon in the center of the dpad */  
 #define GPS_V0  (D_RAD/8)  
 #define GPS_V1  (D_RAD/10)  
 #define GPS_V2  (D_RAD/5)  
   
 /* draw a satellite receiver dish */  
 static void  
 osm_gps_map_osd_dpad_gps(cairo_t *cr, gint x, gint y) {  
     /* move reference to dpad center */  
     x += D_RAD;  
     y += D_RAD + GPS_V0;  
   
     cairo_move_to (cr, x-GPS_V0, y+GPS_V0);  
     cairo_rel_line_to (cr, +GPS_V0, -GPS_V0);  
     cairo_rel_line_to (cr, +GPS_V0, +GPS_V0);  
     cairo_close_path (cr);  
   
     cairo_move_to (cr, x+GPS_V1-GPS_V2, y-2*GPS_V2);  
     cairo_curve_to (cr, x-GPS_V2, y, x+GPS_V1, y+GPS_V1, x+GPS_V1+GPS_V2, y);  
     cairo_close_path (cr);  
   
     x += GPS_V1;  
     cairo_move_to (cr, x, y-GPS_V2);  
     cairo_rel_line_to (cr, +GPS_V1, -GPS_V1);  
 }  
   
 #define Z_LEN  (2*Z_RAD/3)  
   
 static void  
 osm_gps_map_osd_zoom_labels(cairo_t *cr, gint x, gint y) {  
     cairo_move_to (cr, x + Z_LEFT  - Z_LEN, y + Z_MID);  
     cairo_line_to (cr, x + Z_LEFT  + Z_LEN, y + Z_MID);  
   
     cairo_move_to (cr, x + Z_RIGHT,         y + Z_MID - Z_LEN);  
     cairo_line_to (cr, x + Z_RIGHT,         y + Z_MID + Z_LEN);  
     cairo_move_to (cr, x + Z_RIGHT - Z_LEN, y + Z_MID);  
     cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);  
 }  
   
 static void  
 osm_gps_map_osd_labels(cairo_t *cr, gint width) {  
     cairo_set_source_rgb (cr, OSD_COLOR);  
     cairo_set_line_width (cr, width);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_labels_shadow(cairo_t *cr, gint width) {  
     cairo_set_source_rgba (cr, 0, 0, 0, 0.2);  
     cairo_set_line_width (cr, width);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_draw_controls (OsmGpsMap *map, gint xoffset, gint yoffset)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     /* backup previous contents */  
     if(!priv->osd.backup)  
         priv->osd.backup = gdk_pixmap_new(priv->pixmap, OSD_W+2, OSD_H+2, -1);  
   
     gint x = OSD_X + EXTRA_BORDER + xoffset;  
     gint y = OSD_Y + EXTRA_BORDER + yoffset;  
   
     /* create backup of background */  
     gdk_draw_drawable(priv->osd.backup,  
         GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],  
                       priv->pixmap, x-1, y-1, 0, 0, OSD_W+2, OSD_H+2);  
     priv->osd.backup_x = x-1;  
     priv->osd.backup_y = y-1;  
   
 #if 0  
     /* create pixbuf for osd */  
     if(!priv->osd.pixbuf)  
         priv->osd.pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,  
                                           TRUE, 8, OSD_W, OSD_H);  
     cairo_surface_t *surface =  
         cairo_image_surface_create(CAIRO_FORMAT_ARGB32, OSD_W, OSD_H);  
   
     /* fill with transparency */  
     {  
     cairo_t *cr = cairo_create(surface);  
     cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);  
     cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);  
     cairo_paint(cr);  
     cairo_destroy(cr);  
     }  
 #endif  
   
   
 #ifdef USE_CAIRO  
     //    cairo_t *cr = cairo_create(surface);  
     cairo_t *cr = gdk_cairo_create(priv->pixmap);  
   
     /* --------- draw zoom and dpad shape shadow ----------- */  
   
     osm_gps_map_osd_zoom_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);  
     osm_gps_map_osd_shape_shadow(cr);  
     osm_gps_map_osd_dpad_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);  
     osm_gps_map_osd_shape_shadow(cr);  
   
     /* --------- draw zoom and dpad shape ----------- */  
   
     osm_gps_map_osd_zoom_shape(cr, x, y);  
     osm_gps_map_osd_shape(cr);  
     osm_gps_map_osd_dpad_shape(cr, x, y);  
     osm_gps_map_osd_shape(cr);  
   
     /* --------- draw zoom and dpad labels --------- */  
   
     osm_gps_map_osd_zoom_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);  
     osm_gps_map_osd_dpad_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);  
     osm_gps_map_osd_labels_shadow(cr, Z_RAD/3);  
     osm_gps_map_osd_dpad_gps(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);  
     osm_gps_map_osd_labels_shadow(cr, Z_RAD/6);  
   
     osm_gps_map_osd_zoom_labels(cr, x, y);  
     osm_gps_map_osd_dpad_labels(cr, x, y);  
     osm_gps_map_osd_labels(cr, Z_RAD/3);  
     osm_gps_map_osd_dpad_gps(cr, x, y);  
     osm_gps_map_osd_labels(cr, Z_RAD/6);  
   
     cairo_destroy(cr);  
   
 #else  
 #warning "OSD control display lacks a non-cairo implementation!"  
 #endif  
 }  
   
 static void  
 osm_gps_map_osd_restore (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     /* restore backup of previous contents */  
     if(priv->osd.backup) {  
         /* create backup of background */  
         gdk_draw_drawable(priv->pixmap,  
             GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],  
                       priv->osd.backup, 0, 0,  
                       priv->osd.backup_x, priv->osd.backup_y, OSD_W+2, OSD_H+2);  
     }  
 }  
   
 #endif  
   
1420  static gboolean  static gboolean
1421  osm_gps_map_map_redraw (OsmGpsMap *map)  osm_gps_map_map_redraw (OsmGpsMap *map)
1422  {  {
# Line 1766  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1447  osm_gps_map_map_redraw (OsmGpsMap *map)
1447      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1448      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1449      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1450    #ifdef ENABLE_BALLOON
1451      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1452    #endif
1453    
1454  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1455      osm_gps_map_osd_draw_controls(map, 0, 0);      if(priv->osd)
1456            priv->osd->draw(priv->osd, EXTRA_BORDER, EXTRA_BORDER);
1457  #endif  #endif
1458    
1459      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
# Line 1801  osm_gps_map_init (OsmGpsMap *object) Line 1486  osm_gps_map_init (OsmGpsMap *object)
1486      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1487      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1488    
1489    #ifdef ENABLE_BALLOON
1490      priv->balloon.coo = g_new0(coord_t, 1);      priv->balloon.coo = g_new0(coord_t, 1);
1491      priv->balloon.valid = FALSE;      priv->balloon.valid = FALSE;
1492      priv->balloon.cb = NULL;      priv->balloon.cb = NULL;
1493    #endif
1494    
1495  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1496      priv->osd.backup = NULL;      priv->osd = NULL;
1497  #endif  #endif
1498    
1499      priv->tracks = NULL;      priv->tracks = NULL;
# Line 1967  osm_gps_map_dispose (GObject *object) Line 1654  osm_gps_map_dispose (GObject *object)
1654          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1655    
1656      g_free(priv->gps);      g_free(priv->gps);
1657    
1658    #ifdef ENABLE_BALLOON
1659      g_free(priv->balloon.coo);      g_free(priv->balloon.coo);
1660    #endif
1661    
1662  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1663      if (priv->osd.backup)      if(priv->osd)
1664          g_object_unref(priv->osd.backup);          priv->osd->free(priv->osd);
1665  #endif  #endif
1666    
1667      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
# Line 2189  osm_gps_map_button_press (GtkWidget *wid Line 1879  osm_gps_map_button_press (GtkWidget *wid
1879  {  {
1880      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1881    
1882    #ifdef ENABLE_BALLOON
1883      /* don't drag if the user clicked within the balloon */      /* don't drag if the user clicked within the balloon */
1884      if (osm_gps_map_in_balloon(priv,      if (osm_gps_map_in_balloon(priv,
1885                     event->x + EXTRA_BORDER,                     event->x + EXTRA_BORDER,
# Line 2197  osm_gps_map_button_press (GtkWidget *wid Line 1888  osm_gps_map_button_press (GtkWidget *wid
1888          priv->drag_counter = -1;          priv->drag_counter = -1;
1889          return FALSE;          return FALSE;
1890      }      }
1891    #endif
1892    
1893  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1894      /* also don't drag on clicks into the control OSD */      #define SCROLL_STEP 10
1895      if(osm_gps_map_osd_check(event->x, event->y) != OSD_NONE)  
1896      {      /* pressed inside OSD control? */
1897          priv->drag_counter = -1;      if(priv->osd) {
1898          return FALSE;          osd_button_t but = priv->osd->check(event->x, event->y);
1899            if(but != OSD_NONE)
1900            {
1901                priv->drag_counter = -1;
1902    
1903                switch(but) {
1904                case OSD_UP:
1905                    priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;
1906                    priv->center_coord_set = FALSE;
1907                    break;
1908    
1909                case OSD_DOWN:
1910                    priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;
1911                    priv->center_coord_set = FALSE;
1912                    break;
1913    
1914                case OSD_LEFT:
1915                    priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;
1916                    priv->center_coord_set = FALSE;
1917                    break;
1918    
1919                case OSD_RIGHT:
1920                    priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;
1921                    priv->center_coord_set = FALSE;
1922                    break;
1923    
1924                case OSD_IN:
1925                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1926                    break;
1927    
1928                case OSD_OUT:
1929                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1930                    break;
1931    
1932                default:
1933                    /* all custom buttons are forwarded to the application */
1934                    if(priv->osd->cb)
1935                        priv->osd->cb(but, priv->osd->data);
1936                    break;
1937                }
1938    
1939                osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1940    
1941                return FALSE;
1942            }
1943      }      }
1944  #endif  #endif
1945    
# Line 2221  osm_gps_map_button_release (GtkWidget *w Line 1957  osm_gps_map_button_release (GtkWidget *w
1957  {  {
1958      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1959    
1960  #ifdef ENABLE_OSD  #ifdef ENABLE_BALLOON
     /* released inside OSD control? */  
     osd_button_t but = osm_gps_map_osd_check(event->x, event->y);  
     if(but != OSD_NONE)  
     {  
         switch(but) {  
         case OSD_UP:  
             priv->map_y -= GTK_WIDGET(widget)->allocation.height/4;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_DOWN:  
             priv->map_y += GTK_WIDGET(widget)->allocation.height/4;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_LEFT:  
             priv->map_x -= GTK_WIDGET(widget)->allocation.width/4;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_RIGHT:  
             priv->map_x += GTK_WIDGET(widget)->allocation.width/4;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_IN:  
             osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);  
             break;  
   
         case OSD_OUT:  
             osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);  
             break;  
   
         default:  
             break;  
         }  
   
         osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
         return FALSE;  
     }  
 #endif  
   
1961      /* released inside the balloon? */      /* released inside the balloon? */
1962      if (osm_gps_map_in_balloon(priv,      if (osm_gps_map_in_balloon(priv,
1963                     event->x + EXTRA_BORDER,                     event->x + EXTRA_BORDER,
# Line 2274  osm_gps_map_button_release (GtkWidget *w Line 1967  osm_gps_map_button_release (GtkWidget *w
1967               event->x - priv->balloon.rect.x + EXTRA_BORDER,               event->x - priv->balloon.rect.x + EXTRA_BORDER,
1968               event->y - priv->balloon.rect.y + EXTRA_BORDER);               event->y - priv->balloon.rect.y + EXTRA_BORDER);
1969      }      }
1970    #endif
1971    
1972      if (priv->dragging)      if (priv->dragging)
1973      {      {
# Line 2298  osm_gps_map_button_release (GtkWidget *w Line 1992  osm_gps_map_button_release (GtkWidget *w
1992  }  }
1993    
1994  static gboolean  static gboolean
1995    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
1996    
1997    static gboolean
1998  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
1999  {  {
2000      int x, y;      int x, y;
# Line 2326  osm_gps_map_motion_notify (GtkWidget *wi Line 2023  osm_gps_map_motion_notify (GtkWidget *wi
2023      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2024          return FALSE;          return FALSE;
2025    
2026    #ifdef USE_MAEMO
2027        /* reduce update frequency on maemo to keep screen update fluid */
2028        static guint32 last_time = 0;
2029    
2030        if(event->time - last_time < 100) return FALSE;
2031        last_time = event->time;
2032    #endif
2033    
2034      priv->dragging = TRUE;      priv->dragging = TRUE;
2035    
2036      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 2335  osm_gps_map_motion_notify (GtkWidget *wi Line 2040  osm_gps_map_motion_notify (GtkWidget *wi
2040      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2041    
2042  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2043      /* undo OSD */      if(priv->osd) {
2044      osm_gps_map_osd_restore (OSM_GPS_MAP(widget));          /* undo OSD */
2045            priv->osd->restore (priv->osd);
2046    
2047            /* draw new OSD */
2048            priv->osd->draw (priv->osd,
2049                             EXTRA_BORDER - priv->drag_mouse_dx,
2050                             EXTRA_BORDER - priv->drag_mouse_dy);
2051        }
2052    #endif
2053    
2054        osm_gps_map_expose (widget, NULL);
2055    
2056        return FALSE;
2057    }
2058    
2059      /* draw new OSD */  static gboolean
2060      osm_gps_map_osd_draw_controls (OSM_GPS_MAP(widget),  osm_gps_map_configure (GtkWidget *widget, GdkEventConfigure *event)
2061                                     -priv->drag_mouse_dx,  {
2062                                     -priv->drag_mouse_dy);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2063    
2064        /* create pixmap */
2065        if (priv->pixmap)
2066            g_object_unref (priv->pixmap);
2067    
2068        priv->pixmap = gdk_pixmap_new (
2069                                       widget->window,
2070                                       widget->allocation.width + EXTRA_BORDER * 2,
2071                                       widget->allocation.height + EXTRA_BORDER * 2,
2072                                       -1);
2073    
2074    #ifdef ENABLE_OSD
2075        /* the osd needs some references to map internal objects */
2076        if(priv->osd)
2077        {
2078            priv->osd->pixmap = priv->pixmap;
2079            priv->osd->widget = widget;
2080        }
2081  #endif  #endif
2082    
2083        /* and gc, used for clipping (I think......) */
2084        if(priv->gc_map)
2085            g_object_unref(priv->gc_map);
2086    
2087        priv->gc_map = gdk_gc_new(priv->pixmap);
2088    
2089        osm_gps_map_map_redraw(OSM_GPS_MAP(widget));
2090    
2091        return FALSE;
2092    }
2093    
2094    static gboolean
2095    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event)
2096    {
2097        OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2098    
2099      gdk_draw_drawable (      gdk_draw_drawable (
2100                         widget->window,                         widget->window,
2101                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2102                         priv->pixmap,                         priv->pixmap,
2103                         0,0,                         0,0,
2104                         priv->drag_mouse_dx - EXTRA_BORDER, priv->drag_mouse_dy - EXTRA_BORDER,                         priv->drag_mouse_dx - EXTRA_BORDER,
2105                           priv->drag_mouse_dy - EXTRA_BORDER,
2106                         -1,-1);                         -1,-1);
2107    
2108      //Paint white outside of the map if dragging. Its less      //Paint white outside of the map if dragging. Its less
# Line 2393  osm_gps_map_motion_notify (GtkWidget *wi Line 2146  osm_gps_map_motion_notify (GtkWidget *wi
2146                              widget->allocation.width,                              widget->allocation.width,
2147                              -priv->drag_mouse_dy - EXTRA_BORDER);                              -priv->drag_mouse_dy - EXTRA_BORDER);
2148      }      }
2149    #if 0
2150      return FALSE;      if(!priv->dragging)
2151  }          gdk_draw_drawable (
   
 static gboolean  
 osm_gps_map_configure (GtkWidget *widget, GdkEventConfigure *event)  
 {  
     OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);  
   
     /* create pixmap */  
     if (priv->pixmap)  
         g_object_unref (priv->pixmap);  
   
     priv->pixmap = gdk_pixmap_new (  
                                    widget->window,  
                                    widget->allocation.width + EXTRA_BORDER * 2,  
                                    widget->allocation.height + EXTRA_BORDER * 2,  
                                    -1);  
   
     /* and gc, used for clipping (I think......) */  
     if(priv->gc_map)  
         g_object_unref(priv->gc_map);  
   
     priv->gc_map = gdk_gc_new(priv->pixmap);  
   
     osm_gps_map_map_redraw(OSM_GPS_MAP(widget));  
   
     return FALSE;  
 }  
   
 static gboolean  
 osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event)  
 {  
     OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);  
   
     gdk_draw_drawable (  
2152                         widget->window,                         widget->window,
2153                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2154                         priv->pixmap,                         priv->pixmap,
# Line 2436  osm_gps_map_expose (GtkWidget *widget, G Line 2156  osm_gps_map_expose (GtkWidget *widget, G
2156                         event->area.y + EXTRA_BORDER,                         event->area.y + EXTRA_BORDER,
2157                         event->area.x, event->area.y,                         event->area.x, event->area.y,
2158                         event->area.width, event->area.height);                         event->area.width, event->area.height);
   
 #ifdef ENABLE_OSD_OVL  
     /* TODO: intersect with area */  
     if (priv->osd.pixbuf)  
     {  
         //        gdk_draw_drawable (widget->window,  
         //            widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  
         //            priv->osd.pixbuf, 0, 0,  
         //            OSD_X, OSD_Y, OSD_W, OSD_H);  
     }  
2159  #endif  #endif
   
2160      return FALSE;      return FALSE;
2161  }  }
2162    
# Line 2633  osm_gps_map_class_init (OsmGpsMapClass * Line 2342  osm_gps_map_class_init (OsmGpsMapClass *
2342                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2343                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2344                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2345                                                         5,                                                         10,
2346                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2347    
2348      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 3219  osm_gps_map_get_scale(OsmGpsMap *map) Line 2928  osm_gps_map_get_scale(OsmGpsMap *map)
2928      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
2929  }  }
2930    
2931    #ifdef ENABLE_BALLOON
2932  void  void
2933  osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
2934                            OsmGpsMapBalloonCallback cb, gpointer data)                            OsmGpsMapBalloonCallback cb, gpointer data)
# Line 3254  osm_gps_map_clear_balloon (OsmGpsMap *ma Line 2964  osm_gps_map_clear_balloon (OsmGpsMap *ma
2964    
2965      osm_gps_map_map_redraw_idle(map);      osm_gps_map_map_redraw_idle(map);
2966  }  }
2967    #endif
2968    
2969    #ifdef ENABLE_OSD
2970    
2971    void
2972    osm_gps_map_redraw (OsmGpsMap *map)
2973    {
2974        osm_gps_map_map_redraw_idle(map);
2975    }
2976    
2977    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
2978        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2979        return map->priv->osd;
2980    }
2981    
2982    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
2983        OsmGpsMapPrivate *priv;
2984    
2985        g_return_if_fail (OSM_IS_GPS_MAP (map));
2986    
2987        priv = map->priv;
2988        g_return_if_fail (!priv->osd);
2989    
2990        priv->osd = osd;
2991    }
2992    
2993    #endif
Legend:
Removed from v.63  
changed lines
  Added in v.74