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

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

revision 57 by harbaum, Sun Aug 16 19:29:01 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      coord_t *balloon;      struct {
104      gboolean balloon_valid;          coord_t *coo;
105            gboolean valid;
106            OsmGpsMapRect_t rect;
107            OsmGpsMapBalloonCallback cb;
108            gpointer data;
109        } balloon;
110    #endif
111    
112    #ifdef ENABLE_OSD
113        //the osd controls (if present)
114        osm_gps_map_osd_t *osd;
115    #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 637  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  #define BALLOON_CORNER_RADIUS         20  #ifndef BALLOON_AREA_WIDTH
656  #define BALLOON_WIDTH                150  #define BALLOON_AREA_WIDTH           290
657  #define BALLOON_HEIGHT                75  #endif
658    #ifndef BALLOON_AREA_HEIGHT
659    #define BALLOON_AREA_HEIGHT           75
660    #endif
661    #ifndef BALLOON_CORNER_RADIUS
662    #define BALLOON_CORNER_RADIUS         10
663    #endif
664    
665    #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
666    #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
667    #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)
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 */
679  /* for the shadow */  /* for the shadow */
680  static void  static void
# Line 656  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 bottom/left pointer */          /* insert top pointer */
689          cairo_line_to (cr, px1, y0);          cairo_line_to (cr, px1, y0);
690          cairo_line_to (cr, px, py);          cairo_line_to (cr, px, py);
691          cairo_line_to (cr, px0, y0);          cairo_line_to (cr, px0, y0);
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/left pointer */          /* insert bottom pointer */
702          cairo_line_to (cr, px0, y1);          cairo_line_to (cr, px0, y1);
703          cairo_line_to (cr, px, py);          cairo_line_to (cr, px, py);
704          cairo_line_to (cr, px1, y1);          cairo_line_to (cr, px1, y1);
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  }  }
713    
 /* http://cairographics.org/samples/ */  
714  static void  static void
715  osm_gps_map_draw_balloon_int (OsmGpsMap *map)  osm_gps_map_draw_balloon_int (OsmGpsMap *map)
716  {  {
717      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
718    
719      if (priv->balloon_valid) {      if (priv->balloon.valid) {
720    
721          /* ------- convert given coordinate into screen position --------- */          /* ------- convert given coordinate into screen position --------- */
722          int x0 = lon2pixel(priv->map_zoom, priv->balloon->rlon) -          int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) -
723              priv->map_x + EXTRA_BORDER;              priv->map_x + EXTRA_BORDER;
724          int y0 = lat2pixel(priv->map_zoom, priv->balloon->rlat) -          int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) -
725              priv->map_y + EXTRA_BORDER;              priv->map_y + EXTRA_BORDER;
726    
727          /* check position of this relative to screen center to determine */          /* check position of this relative to screen center to determine */
# Line 721  osm_gps_map_draw_balloon_int (OsmGpsMap Line 750  osm_gps_map_draw_balloon_int (OsmGpsMap
750          /* calculate bottom/right of box */          /* calculate bottom/right of box */
751          int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;          int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
752    
753            /* save balloon screen coordinates for later use */
754            priv->balloon.rect.x = x0 + BALLOON_BORDER;
755            priv->balloon.rect.y = y0 + BALLOON_BORDER;
756            priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
757            priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
758    
759  #ifdef USE_CAIRO  #ifdef USE_CAIRO
760          cairo_t *cr = gdk_cairo_create(priv->pixmap);          cairo_t *cr = gdk_cairo_create(priv->pixmap);
761    
# Line 750  osm_gps_map_draw_balloon_int (OsmGpsMap Line 785  osm_gps_map_draw_balloon_int (OsmGpsMap
785    
786          /* ---------- draw close button --------- */          /* ---------- draw close button --------- */
787    
788          int cx = x1 - BALLOON_CORNER_RADIUS*3/4;          int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS;
789          int cy = y0 + BALLOON_CORNER_RADIUS*3/4;          int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS;
790          int crad = BALLOON_CORNER_RADIUS/3;          int crad = CLOSE_BUTTON_RADIUS;
791    
792          cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);          cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);
793          cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);          cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);
794          cairo_fill_preserve (cr);          cairo_fill_preserve (cr);
795          cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);          cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);
796          cairo_set_line_width (cr, 1);          cairo_set_line_width (cr, 2);
797          cairo_stroke(cr);          cairo_stroke(cr);
798    
         int cs = crad/2;  
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 - cs, cy - cs);          cairo_move_to (cr, cx - crad/2, cy - crad/2);
803          cairo_line_to (cr, cx + cs, cy + cs);          cairo_line_to (cr, cx + crad/2, cy + crad/2);
804          cairo_stroke (cr);          cairo_stroke (cr);
805          cairo_move_to (cr, cx + cs, cy - cs);          cairo_move_to (cr, cx + crad/2, cy - crad/2);
806          cairo_line_to (cr, cx - cs, cy + cs);          cairo_line_to (cr, cx - crad/2, cy + crad/2);
807          cairo_stroke (cr);          cairo_stroke (cr);
808    
809            if (priv->balloon.cb) {
810                /* clip in case application tries to draw in */
811                /* exceed of the balloon */
812                cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
813                                 priv->balloon.rect.w, priv->balloon.rect.h);
814                cairo_clip (cr);
815                cairo_new_path (cr);  /* current path is not
816                                         consumed by cairo_clip() */
817    
818                priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
819            }
820    
821            cairo_destroy(cr);
822    
823          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
824                                      x0, y0, BALLOON_WIDTH,                                      x0, y0, BALLOON_WIDTH,
825                                      BALLOON_HEIGHT + POINTER_HEIGHT);                                      BALLOON_HEIGHT + POINTER_HEIGHT);
# Line 782  osm_gps_map_draw_balloon_int (OsmGpsMap Line 829  osm_gps_map_draw_balloon_int (OsmGpsMap
829      }      }
830  }  }
831    
832    /* the user clicked into the balloons main area. handle this */
833    static void
834    osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y)
835    {
836        OsmGpsMapPrivate *priv = map->priv;
837    
838        if (!priv->balloon.valid)
839            return;
840    
841        /* check if the close button was clicked */
842        if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) &&
843            (x < priv->balloon.rect.w) &&
844            (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) {
845    
846            priv->balloon.valid = FALSE;
847            osm_gps_map_map_redraw_idle(map);
848        }
849    }
850    
851    /* return true if balloon is being displayed and if */
852    /* the given coordinate is within this balloon */
853    static gboolean
854    osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y)
855    {
856        return (priv->balloon.valid &&
857                (x > priv->balloon.rect.x) &&
858                (x < priv->balloon.rect.x + priv->balloon.rect.w) &&
859                (y > priv->balloon.rect.y) &&
860                (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)
866  {  {
# Line 844  osm_gps_map_tile_download_complete (Soup Line 923  osm_gps_map_tile_download_complete (Soup
923              }              }
924              else              else
925              {              {
926                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
927                              dl->folder);
928                    perror("perror:");
929              }              }
930          }          }
931    
# Line 1366  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
1455        if(priv->osd)
1456            priv->osd->draw(priv->osd, EXTRA_BORDER, EXTRA_BORDER);
1457    #endif
1458    
1459      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1460      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
# Line 1398  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      priv->balloon = g_new0(coord_t, 1);  #ifdef ENABLE_BALLOON
1490      priv->balloon_valid = FALSE;      priv->balloon.coo = g_new0(coord_t, 1);
1491        priv->balloon.valid = FALSE;
1492        priv->balloon.cb = NULL;
1493    #endif
1494    
1495    #ifdef ENABLE_OSD
1496        priv->osd = NULL;
1497    #endif
1498    
1499      priv->tracks = NULL;      priv->tracks = NULL;
1500      priv->images = NULL;      priv->images = NULL;
# Line 1559  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      g_free(priv->balloon);  
1658    #ifdef ENABLE_BALLOON
1659        g_free(priv->balloon.coo);
1660    #endif
1661    
1662    #ifdef ENABLE_OSD
1663        if(priv->osd)
1664            priv->osd->free(priv->osd);
1665    #endif
1666    
1667      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1668  }  }
# Line 1776  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 */
1884        if (osm_gps_map_in_balloon(priv,
1885                       event->x + EXTRA_BORDER,
1886                       event->y + EXTRA_BORDER))
1887        {
1888            priv->drag_counter = -1;
1889            return FALSE;
1890        }
1891    #endif
1892    
1893    #ifdef ENABLE_OSD
1894        #define SCROLL_STEP 10
1895    
1896        /* pressed inside OSD control? */
1897        if(priv->osd) {
1898            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
1945    
1946      priv->drag_counter = 0;      priv->drag_counter = 0;
1947      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
1948      priv->drag_start_mouse_y = (int) event->y;      priv->drag_start_mouse_y = (int) event->y;
# Line 1790  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_BALLOON
1961        /* released inside the balloon? */
1962        if (osm_gps_map_in_balloon(priv,
1963                       event->x + EXTRA_BORDER,
1964                       event->y + EXTRA_BORDER))
1965        {
1966            osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),
1967                 event->x - priv->balloon.rect.x + EXTRA_BORDER,
1968                 event->y - priv->balloon.rect.y + EXTRA_BORDER);
1969        }
1970    #endif
1971    
1972      if (priv->dragging)      if (priv->dragging)
1973      {      {
1974          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 1807  osm_gps_map_button_release (GtkWidget *w Line 1986  osm_gps_map_button_release (GtkWidget *w
1986    
1987      priv->drag_mouse_dx = 0;      priv->drag_mouse_dx = 0;
1988      priv->drag_mouse_dy = 0;      priv->drag_mouse_dy = 0;
1989      priv->drag_counter = 0;      priv->drag_counter = -1;
1990    
1991      return FALSE;      return FALSE;
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 1832  osm_gps_map_motion_notify (GtkWidget *wi Line 2014  osm_gps_map_motion_notify (GtkWidget *wi
2014      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
2015          return FALSE;          return FALSE;
2016    
2017        if (priv->drag_counter < 0)
2018            return FALSE;
2019    
2020      priv->drag_counter++;      priv->drag_counter++;
2021    
2022      // we havent dragged more than 6 pixels      // we havent dragged more than 6 pixels
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 1846  osm_gps_map_motion_notify (GtkWidget *wi Line 2039  osm_gps_map_motion_notify (GtkWidget *wi
2039      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
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
2043        if(priv->osd) {
2044            /* 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    static gboolean
2060    osm_gps_map_configure (GtkWidget *widget, GdkEventConfigure *event)
2061    {
2062        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
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 1895  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,
2155                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         event->area.x + EXTRA_BORDER,
2156                           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);
2159    #endif
2160      return FALSE;      return FALSE;
2161  }  }
2162    
# Line 2123  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 2709  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)
2935  {  {
2936      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2937    
# Line 2720  osm_gps_map_draw_balloon (OsmGpsMap *map Line 2941  osm_gps_map_draw_balloon (OsmGpsMap *map
2941      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
2942      priv = map->priv;      priv = map->priv;
2943    
2944      priv->balloon->rlat = deg2rad(latitude);      priv->balloon.coo->rlat = deg2rad(latitude);
2945      priv->balloon->rlon = deg2rad(longitude);      priv->balloon.coo->rlon = deg2rad(longitude);
2946      priv->balloon_valid = TRUE;      priv->balloon.valid = TRUE;
2947    
2948        priv->balloon.cb = cb;
2949        priv->balloon.data = data;
2950    
2951      // this redraws the map      // this redraws the map
2952      osm_gps_map_map_redraw_idle(map);      osm_gps_map_map_redraw_idle(map);
# Line 2736  osm_gps_map_clear_balloon (OsmGpsMap *ma Line 2960  osm_gps_map_clear_balloon (OsmGpsMap *ma
2960      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
2961      priv = map->priv;      priv = map->priv;
2962    
2963      priv->balloon_valid = FALSE;      priv->balloon.valid = FALSE;
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.57  
changed lines
  Added in v.74