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

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

revision 55 by harbaum, Thu Aug 13 12:01:52 2009 UTC revision 77 by harbaum, Tue Aug 25 12:49:03 2009 UTC
# Line 49  Line 49 
49    
50  #define EXTRA_BORDER (TILESIZE / 2)  #define EXTRA_BORDER (TILESIZE / 2)
51    
52    #define OSM_GPS_MAP_SCROLL_STEP 10
53    
54    /* any defined key enables key support */
55    #if (defined(OSM_GPS_MAP_KEY_FULLSCREEN) || \
56         defined(OSM_GPS_MAP_KEY_ZOOMIN) || \
57         defined(OSM_GPS_MAP_KEY_ZOOMOUT) || \
58         defined(OSM_GPS_MAP_KEY_UP) || \
59         defined(OSM_GPS_MAP_KEY_DOWN) || \
60         defined(OSM_GPS_MAP_KEY_LEFT) || \
61         defined(OSM_GPS_MAP_KEY_RIGHT))
62    #define OSM_GPS_MAP_KEYS
63    #endif
64    
65    #ifdef OSM_GPS_MAP_KEYS
66    #include <gdk/gdkkeysyms.h>
67    #endif
68    
69  struct _OsmGpsMapPrivate  struct _OsmGpsMapPrivate
70  {  {
71      GHashTable *tile_queue;      GHashTable *tile_queue;
# Line 98  struct _OsmGpsMapPrivate Line 115  struct _OsmGpsMapPrivate
115      coord_t *gps;      coord_t *gps;
116      gboolean gps_valid;      gboolean gps_valid;
117    
118    #ifdef ENABLE_BALLOON
119        //a balloon with additional info
120        struct {
121            coord_t *coo;
122            gboolean valid;
123            OsmGpsMapRect_t rect;
124            OsmGpsMapBalloonCallback cb;
125            gpointer data;
126        } balloon;
127    #endif
128    
129    #ifdef ENABLE_OSD
130        //the osd controls (if present)
131        osm_gps_map_osd_t *osd;
132    #ifdef OSD_DOUBLE_BUFFER
133        GdkPixmap *dbuf_pixmap;
134    #endif
135    #endif
136    
137    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
138        gboolean fullscreen;
139    #endif
140    
141      //additional images or tracks added to the map      //additional images or tracks added to the map
142      GSList *tracks;      GSList *tracks;
143      GSList *images;      GSList *images;
# Line 631  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 671  osm_gps_map_draw_gps_point (OsmGpsMap *m
671                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
672  #endif  #endif
673      }      }
674    }
675    
676    #ifdef ENABLE_BALLOON
677    /* most visual effects are hardcoded by now, but may be made */
678    /* available via properties later */
679    #ifndef BALLOON_AREA_WIDTH
680    #define BALLOON_AREA_WIDTH           290
681    #endif
682    #ifndef BALLOON_AREA_HEIGHT
683    #define BALLOON_AREA_HEIGHT           75
684    #endif
685    #ifndef BALLOON_CORNER_RADIUS
686    #define BALLOON_CORNER_RADIUS         10
687    #endif
688    
689    #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
690    #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
691    #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
692    #define BALLOON_TRANSPARENCY         0.8
693    #define POINTER_HEIGHT                20
694    #define POINTER_FOOT_WIDTH            20
695    #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
696    #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
697    #define BALLOON_SHADOW_TRANSPARENCY  0.2
698    
699    #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
700    
701    
702    /* draw the bubble shape. this is used twice, once for the shape and once */
703    /* for the shadow */
704    static void
705    osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
706           gboolean bottom, int px, int py, int px0, int px1) {
707    
708        cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
709        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
710                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
711        if(!bottom) {
712            /* insert top pointer */
713            cairo_line_to (cr, px1, y0);
714            cairo_line_to (cr, px, py);
715            cairo_line_to (cr, px0, y0);
716        }
717    
718        cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
719        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
720                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
721        cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
722        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
723                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
724        if(bottom) {
725            /* insert bottom pointer */
726            cairo_line_to (cr, px0, y1);
727            cairo_line_to (cr, px, py);
728            cairo_line_to (cr, px1, y1);
729        }
730    
731        cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
732        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
733                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
734    
735        cairo_close_path (cr);
736    }
737    
738    static void
739    osm_gps_map_draw_balloon_int (OsmGpsMap *map)
740    {
741        OsmGpsMapPrivate *priv = map->priv;
742    
743        if (priv->balloon.valid) {
744    
745            /* ------- convert given coordinate into screen position --------- */
746            int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) -
747                priv->map_x + EXTRA_BORDER;
748            int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) -
749                priv->map_y + EXTRA_BORDER;
750    
751            /* check position of this relative to screen center to determine */
752            /* pointer direction ... */
753            int pointer_x = x0, pointer_x0, pointer_x1;
754            int pointer_y = y0;
755    
756            /* ... and calculate position */
757            if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) {
758                x0 -= BALLOON_WIDTH - POINTER_OFFSET;
759                pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
760                pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;
761            } else {
762                x0 -= POINTER_OFFSET;
763                pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
764                pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;
765            }
766    
767            gboolean bottom = FALSE;
768            if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) {
769                bottom = TRUE;
770                y0 -= BALLOON_HEIGHT + POINTER_HEIGHT;
771            } else
772                y0 += POINTER_HEIGHT;
773    
774            /* calculate bottom/right of box */
775            int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
776    
777            /* save balloon screen coordinates for later use */
778            priv->balloon.rect.x = x0 + BALLOON_BORDER;
779            priv->balloon.rect.y = y0 + BALLOON_BORDER;
780            priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
781            priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
782    
783    #ifdef USE_CAIRO
784            cairo_t *cr = gdk_cairo_create(priv->pixmap);
785    
786            /* --------- draw shadow --------------- */
787            osm_gps_map_draw_balloon_shape (cr,
788                        x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW,
789                        x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,
790                        bottom, pointer_x, pointer_y,
791                        pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);
792    
793            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);
794            cairo_fill_preserve (cr);
795            cairo_set_source_rgba (cr, 1, 0, 0, 1.0);
796            cairo_set_line_width (cr, 0);
797            cairo_stroke (cr);
798    
799            /* --------- draw main shape ----------- */
800            osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,
801                        bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);
802    
803            cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);
804            cairo_fill_preserve (cr);
805            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);
806            cairo_set_line_width (cr, 1);
807            cairo_stroke (cr);
808    
809    
810            /* ---------- draw close button --------- */
811    
812            int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS;
813            int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS;
814            int crad = CLOSE_BUTTON_RADIUS;
815    
816            cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);
817            cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);
818            cairo_fill_preserve (cr);
819            cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);
820            cairo_set_line_width (cr, 2);
821            cairo_stroke(cr);
822    
823            cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
824            cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);
825            cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
826            cairo_move_to (cr, cx - crad/2, cy - crad/2);
827            cairo_line_to (cr, cx + crad/2, cy + crad/2);
828            cairo_stroke (cr);
829            cairo_move_to (cr, cx + crad/2, cy - crad/2);
830            cairo_line_to (cr, cx - crad/2, cy + crad/2);
831            cairo_stroke (cr);
832    
833            if (priv->balloon.cb) {
834                /* clip in case application tries to draw in */
835                /* exceed of the balloon */
836                cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
837                                 priv->balloon.rect.w, priv->balloon.rect.h);
838                cairo_clip (cr);
839                cairo_new_path (cr);  /* current path is not
840                                         consumed by cairo_clip() */
841    
842                priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
843            }
844    
845            cairo_destroy(cr);
846    
847            gtk_widget_queue_draw_area (GTK_WIDGET(map),
848                                        x0, y0, BALLOON_WIDTH,
849                                        BALLOON_HEIGHT + POINTER_HEIGHT);
850    #else
851    #warning "Balloon display lacks a non-cairo implementation!"
852    #endif
853        }
854    }
855    
856    /* the user clicked into the balloons main area. handle this */
857    static void
858    osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y)
859    {
860        OsmGpsMapPrivate *priv = map->priv;
861    
862        if (!priv->balloon.valid)
863            return;
864    
865        /* check if the close button was clicked */
866        if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) &&
867            (x < priv->balloon.rect.w) &&
868            (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) {
869    
870            priv->balloon.valid = FALSE;
871            osm_gps_map_map_redraw_idle(map);
872        }
873    }
874    
875    /* return true if balloon is being displayed and if */
876    /* the given coordinate is within this balloon */
877    static gboolean
878    osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y)
879    {
880        return (priv->balloon.valid &&
881                (x > priv->balloon.rect.x) &&
882                (x < priv->balloon.rect.x + priv->balloon.rect.w) &&
883                (y > priv->balloon.rect.y) &&
884                (y < priv->balloon.rect.y + priv->balloon.rect.h));
885  }  }
886    #endif // ENABLE_BALLOON
887    
888  static void  static void
889  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 695  osm_gps_map_tile_download_complete (Soup Line 947  osm_gps_map_tile_download_complete (Soup
947              }              }
948              else              else
949              {              {
950                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
951                              dl->folder);
952                    perror("perror:");
953              }              }
954          }          }
955    
# Line 1217  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1471  osm_gps_map_map_redraw (OsmGpsMap *map)
1471      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1472      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1473      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1474    #ifdef ENABLE_BALLOON
1475        osm_gps_map_draw_balloon_int(map);
1476    #endif
1477    
1478      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1479      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
# Line 1234  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1491  osm_gps_map_map_redraw_idle (OsmGpsMap *
1491          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);
1492  }  }
1493    
1494    #ifdef OSM_GPS_MAP_KEYS
1495    static gboolean
1496    on_window_key_press(GtkWidget *widget,
1497                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1498      gboolean handled = FALSE;
1499      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1500    
1501      printf("key event with keyval %x\n", event->keyval);
1502    
1503      // the map handles some keys on its own ...
1504      switch(event->keyval) {
1505    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1506      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1507          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1508          if(!priv->fullscreen)
1509              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1510          else
1511              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1512    
1513          priv->fullscreen = !priv->fullscreen;
1514          handled = TRUE;
1515          } break;
1516    #endif
1517    
1518    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1519      case OSM_GPS_MAP_KEY_ZOOMIN:
1520          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1521          handled = TRUE;
1522          break;
1523    #endif
1524    
1525    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1526      case OSM_GPS_MAP_KEY_ZOOMOUT:
1527          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1528          handled = TRUE;
1529          break;
1530    #endif
1531    
1532    #ifdef OSM_GPS_MAP_KEY_UP
1533      case OSM_GPS_MAP_KEY_UP:
1534          priv->map_y -= step;
1535          priv->center_coord_set = FALSE;
1536          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1537          handled = TRUE;
1538          break;
1539    #endif
1540    
1541    #ifdef OSM_GPS_MAP_KEY_DOWN
1542      case OSM_GPS_MAP_KEY_DOWN:
1543          priv->map_y += step;
1544          priv->center_coord_set = FALSE;
1545          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1546          handled = TRUE;
1547          break;
1548    #endif
1549    
1550    #ifdef OSM_GPS_MAP_KEY_LEFT
1551      case OSM_GPS_MAP_KEY_LEFT:
1552          priv->map_x -= step;
1553          priv->center_coord_set = FALSE;
1554          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1555          handled = TRUE;
1556          break;
1557    #endif
1558    
1559    #ifdef OSM_GPS_MAP_KEY_RIGHT
1560      case OSM_GPS_MAP_KEY_RIGHT:
1561          priv->map_x += step;
1562          priv->center_coord_set = FALSE;
1563          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1564          handled = TRUE;
1565          break;
1566    #endif
1567    
1568      default:
1569          printf("unhandled key event with keyval %x\n", event->keyval);
1570          break;
1571      }
1572    
1573      return handled;
1574    }
1575    #endif
1576    
1577  static void  static void
1578  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1579  {  {
# Line 1248  osm_gps_map_init (OsmGpsMap *object) Line 1588  osm_gps_map_init (OsmGpsMap *object)
1588      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1589      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1590    
1591    #ifdef ENABLE_BALLOON
1592        priv->balloon.coo = g_new0(coord_t, 1);
1593        priv->balloon.valid = FALSE;
1594        priv->balloon.cb = NULL;
1595    #endif
1596    
1597    #ifdef ENABLE_OSD
1598        priv->osd = NULL;
1599    #endif
1600    
1601    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1602        priv->fullscreen = FALSE;
1603    #endif
1604    
1605      priv->tracks = NULL;      priv->tracks = NULL;
1606      priv->images = NULL;      priv->images = NULL;
1607    
# Line 1292  osm_gps_map_init (OsmGpsMap *object) Line 1646  osm_gps_map_init (OsmGpsMap *object)
1646      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1647    
1648      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);
 }  
1649    
1650  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1651  /* simple hash algorithm hack if md5 is not present */      //    GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(object));
1652  static char *simple_hash(char *str) {      g_signal_connect(G_OBJECT(object), "key_press_event",
1653      union {                       G_CALLBACK(on_window_key_press), priv);
         char str[4];  
         gulong val;  
     } hash = { .val = 0x55555555 };  
   
     while(*str) {  
         hash.str[(int)str & 3] ^= *str;  
         str++;  
     }  
     return g_strdup_printf("%08lX", hash.val);  
 }  
1654  #endif  #endif
1655    }
1656    
1657  static GObject *  static GObject *
1658  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
# Line 1348  osm_gps_map_constructor (GType gtype, gu Line 1692  osm_gps_map_constructor (GType gtype, gu
1692      }      }
1693    
1694      if (!priv->cache_dir_is_full_path) {      if (!priv->cache_dir_is_full_path) {
1695  #ifdef G_CHECKSUM_MD5          const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1696          char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);          if(!fname) fname = "_unknown_";
 #else  
         char *md5 = simple_hash(priv->repo_uri);  
 #endif  
1697    
1698          if (priv->cache_dir) {          if (priv->cache_dir) {
1699              char *old = priv->cache_dir;              char *old = priv->cache_dir;
1700              //the new cachedir is the given cache dir + the md5 of the repo_uri              //the new cachedir is the given cache dir + the md5 of the repo_uri
1701              priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);              priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, fname);
1702              g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);              g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);
1703              g_free(old);              g_free(old);
1704          } else {          } else {
1705              //the new cachedir is the current dir + the md5 of the repo_uri              //the new cachedir is the current dir + the md5 of the repo_uri
1706              priv->cache_dir = g_strdup(md5);              priv->cache_dir = g_strdup(fname);
1707          }          }
   
         g_free(md5);  
1708      }      }
1709    
1710      inspect_map_uri(map);      inspect_map_uri(map);
# Line 1405  osm_gps_map_dispose (GObject *object) Line 1744  osm_gps_map_dispose (GObject *object)
1744      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1745          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1746    
1747        g_free(priv->gps);
1748    
1749    #ifdef ENABLE_BALLOON
1750        g_free(priv->balloon.coo);
1751    #endif
1752    
1753    #ifdef ENABLE_OSD
1754        if(priv->osd)
1755            priv->osd->free(priv->osd);
1756    
1757    #ifdef OSD_DOUBLE_BUFFER
1758        if(priv->dbuf_pixmap)
1759            g_object_unref (priv->dbuf_pixmap);
1760    #endif
1761    #endif
1762    
1763      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1764  }  }
1765    
# Line 1620  osm_gps_map_button_press (GtkWidget *wid Line 1975  osm_gps_map_button_press (GtkWidget *wid
1975  {  {
1976      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1977    
1978    #ifdef ENABLE_BALLOON
1979        /* don't drag if the user clicked within the balloon */
1980        if (osm_gps_map_in_balloon(priv,
1981                       event->x + EXTRA_BORDER,
1982                       event->y + EXTRA_BORDER))
1983        {
1984            priv->drag_counter = -1;
1985            return FALSE;
1986        }
1987    #endif
1988    
1989    #ifdef ENABLE_OSD
1990        /* pressed inside OSD control? */
1991        if(priv->osd) {
1992            osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
1993            if(but != OSD_NONE)
1994            {
1995                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1996                priv->drag_counter = -1;
1997    
1998                switch(but) {
1999                case OSD_UP:
2000                    priv->map_y -= step;
2001                    priv->center_coord_set = FALSE;
2002                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2003                    break;
2004    
2005                case OSD_DOWN:
2006                    priv->map_y += step;
2007                    priv->center_coord_set = FALSE;
2008                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2009                    break;
2010    
2011                case OSD_LEFT:
2012                    priv->map_x -= step;
2013                    priv->center_coord_set = FALSE;
2014                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2015                    break;
2016    
2017                case OSD_RIGHT:
2018                    priv->map_x += step;
2019                    priv->center_coord_set = FALSE;
2020                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2021                    break;
2022    
2023                case OSD_IN:
2024                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
2025                    break;
2026    
2027                case OSD_OUT:
2028                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
2029                    break;
2030    
2031                default:
2032                    /* all custom buttons are forwarded to the application */
2033                    if(priv->osd->cb)
2034                        priv->osd->cb(but, priv->osd->data);
2035                    break;
2036                }
2037    
2038                return FALSE;
2039            }
2040        }
2041    #endif
2042    
2043      priv->drag_counter = 0;      priv->drag_counter = 0;
2044      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
2045      priv->drag_start_mouse_y = (int) event->y;      priv->drag_start_mouse_y = (int) event->y;
# Line 1634  osm_gps_map_button_release (GtkWidget *w Line 2054  osm_gps_map_button_release (GtkWidget *w
2054  {  {
2055      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2056    
2057    #ifdef ENABLE_BALLOON
2058        /* released inside the balloon? */
2059        if (osm_gps_map_in_balloon(priv,
2060                       event->x + EXTRA_BORDER,
2061                       event->y + EXTRA_BORDER))
2062        {
2063            osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),
2064                 event->x - priv->balloon.rect.x + EXTRA_BORDER,
2065                 event->y - priv->balloon.rect.y + EXTRA_BORDER);
2066        }
2067    #endif
2068    
2069      if (priv->dragging)      if (priv->dragging)
2070      {      {
2071          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 1651  osm_gps_map_button_release (GtkWidget *w Line 2083  osm_gps_map_button_release (GtkWidget *w
2083    
2084      priv->drag_mouse_dx = 0;      priv->drag_mouse_dx = 0;
2085      priv->drag_mouse_dy = 0;      priv->drag_mouse_dy = 0;
2086      priv->drag_counter = 0;      priv->drag_counter = -1;
2087    
2088      return FALSE;      return FALSE;
2089  }  }
2090    
2091  static gboolean  static gboolean
2092    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
2093    
2094    static gboolean
2095  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
2096  {  {
2097      int x, y;      int x, y;
# Line 1676  osm_gps_map_motion_notify (GtkWidget *wi Line 2111  osm_gps_map_motion_notify (GtkWidget *wi
2111      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
2112          return FALSE;          return FALSE;
2113    
2114        if (priv->drag_counter < 0)
2115            return FALSE;
2116    
2117      priv->drag_counter++;      priv->drag_counter++;
2118    
2119      // we havent dragged more than 6 pixels      // we havent dragged more than 6 pixels
2120      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2121          return FALSE;          return FALSE;
2122    
2123    #ifdef OSM_GPS_MAP_REFRESH
2124        /* reduce update frequency on maemo to keep screen update fluid */
2125        static guint32 last_time = 0;
2126    
2127        if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2128        last_time = event->time;
2129    #endif
2130    
2131      priv->dragging = TRUE;      priv->dragging = TRUE;
2132    
2133      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1690  osm_gps_map_motion_notify (GtkWidget *wi Line 2136  osm_gps_map_motion_notify (GtkWidget *wi
2136      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2137      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2138    
2139      gdk_draw_drawable (      osm_gps_map_expose (widget, NULL);
2140                         widget->window,  
2141        return FALSE;
2142    }
2143    
2144    static gboolean
2145    osm_gps_map_configure (GtkWidget *widget, GdkEventConfigure *event)
2146    {
2147        OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2148    
2149        /* create pixmap */
2150        if (priv->pixmap)
2151            g_object_unref (priv->pixmap);
2152    
2153        priv->pixmap = gdk_pixmap_new (
2154                            widget->window,
2155                            widget->allocation.width + EXTRA_BORDER * 2,
2156                            widget->allocation.height + EXTRA_BORDER * 2,
2157                            -1);
2158    
2159    #ifdef ENABLE_OSD
2160    
2161    #ifdef OSD_DOUBLE_BUFFER
2162        if (priv->dbuf_pixmap)
2163            g_object_unref (priv->dbuf_pixmap);
2164    
2165        priv->dbuf_pixmap = gdk_pixmap_new (
2166                            widget->window,
2167                            widget->allocation.width,
2168                            widget->allocation.height,
2169                            -1);
2170    #endif
2171    
2172        /* the osd needs some references to map internal objects */
2173        if(priv->osd)
2174            priv->osd->widget = widget;
2175    #endif
2176    
2177        /* and gc, used for clipping (I think......) */
2178        if(priv->gc_map)
2179            g_object_unref(priv->gc_map);
2180    
2181        priv->gc_map = gdk_gc_new(priv->pixmap);
2182    
2183        osm_gps_map_map_redraw(OSM_GPS_MAP(widget));
2184    
2185        return FALSE;
2186    }
2187    
2188    static gboolean
2189    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event)
2190    {
2191        OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2192    
2193    #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2194        GdkDrawable *drawable = priv->dbuf_pixmap;
2195    #else
2196        GdkDrawable *drawable = widget->window;
2197    #endif
2198    
2199        gdk_draw_drawable (drawable,
2200                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2201                         priv->pixmap,                         priv->pixmap,
2202                         0,0,                         0,0,
2203                         priv->drag_mouse_dx - EXTRA_BORDER, priv->drag_mouse_dy - EXTRA_BORDER,                         priv->drag_mouse_dx - EXTRA_BORDER,
2204                           priv->drag_mouse_dy - EXTRA_BORDER,
2205                         -1,-1);                         -1,-1);
2206    
2207      //Paint white outside of the map if dragging. Its less      //Paint white outside of the map if dragging. Its less
2208      //ugly than painting the corrupted map      //ugly than painting the corrupted map
2209      if(priv->drag_mouse_dx>EXTRA_BORDER) {      if(priv->drag_mouse_dx>EXTRA_BORDER) {
2210          gdk_draw_rectangle (          gdk_draw_rectangle (drawable,
                             widget->window,  
2211                              widget->style->white_gc,                              widget->style->white_gc,
2212                              TRUE,                              TRUE,
2213                              0, 0,                              0, 0,
# Line 1711  osm_gps_map_motion_notify (GtkWidget *wi Line 2216  osm_gps_map_motion_notify (GtkWidget *wi
2216      }      }
2217      else if (-priv->drag_mouse_dx > EXTRA_BORDER)      else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2218      {      {
2219          gdk_draw_rectangle (          gdk_draw_rectangle (drawable,
                             widget->window,  
2220                              widget->style->white_gc,                              widget->style->white_gc,
2221                              TRUE,                              TRUE,
2222                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
# Line 1721  osm_gps_map_motion_notify (GtkWidget *wi Line 2225  osm_gps_map_motion_notify (GtkWidget *wi
2225      }      }
2226    
2227      if (priv->drag_mouse_dy>EXTRA_BORDER) {      if (priv->drag_mouse_dy>EXTRA_BORDER) {
2228          gdk_draw_rectangle (          gdk_draw_rectangle (drawable,
                             widget->window,  
2229                              widget->style->white_gc,                              widget->style->white_gc,
2230                              TRUE,                              TRUE,
2231                              0, 0,                              0, 0,
# Line 1731  osm_gps_map_motion_notify (GtkWidget *wi Line 2234  osm_gps_map_motion_notify (GtkWidget *wi
2234      }      }
2235      else if (-priv->drag_mouse_dy > EXTRA_BORDER)      else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2236      {      {
2237          gdk_draw_rectangle (          gdk_draw_rectangle (drawable,
                             widget->window,  
2238                              widget->style->white_gc,                              widget->style->white_gc,
2239                              TRUE,                              TRUE,
2240                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
# Line 1740  osm_gps_map_motion_notify (GtkWidget *wi Line 2242  osm_gps_map_motion_notify (GtkWidget *wi
2242                              -priv->drag_mouse_dy - EXTRA_BORDER);                              -priv->drag_mouse_dy - EXTRA_BORDER);
2243      }      }
2244    
2245      return FALSE;  #ifdef ENABLE_OSD
2246  }      /* draw new OSD */
2247        if(priv->osd)
2248  static gboolean          priv->osd->draw (priv->osd, drawable);
 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));  
2249    
2250      return FALSE;  #ifdef OSD_DOUBLE_BUFFER
2251  }      gdk_draw_drawable (widget->window,
   
 static gboolean  
 osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event)  
 {  
     OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);  
   
     gdk_draw_drawable (  
                        widget->window,  
2252                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2253                         priv->pixmap,                         priv->dbuf_pixmap,
2254                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2255                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2256    
2257    #endif
2258    
2259      return FALSE;      return FALSE;
2260  }  }
2261    
# Line 1967  osm_gps_map_class_init (OsmGpsMapClass * Line 2441  osm_gps_map_class_init (OsmGpsMapClass *
2441                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2442                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2443                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2444                                                         5,                                                         10,
2445                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2446    
2447      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 2361  osm_gps_map_clear_images (OsmGpsMap *map Line 2835  osm_gps_map_clear_images (OsmGpsMap *map
2835  }  }
2836    
2837  void  void
 osm_gps_map_osd_speed (OsmGpsMap *map, float speed)  
 {  
     OsmGpsMapPrivate *priv;  
   
     PangoContext        *context = NULL;  
     PangoLayout     *layout  = NULL;  
     PangoFontDescription    *desc    = NULL;  
   
     GdkColor color;  
     GdkGC *gc;  
   
     gchar *buffer;  
     //static int x = 10, y = 10;  
     static int width = 0, height = 0;  
   
     g_return_if_fail (OSM_IS_GPS_MAP (map));  
     priv = map->priv;  
   
     buffer = g_strdup_printf("%.0f", speed);  
   
     /* pango initialisation */  
     context = gtk_widget_get_pango_context (GTK_WIDGET(map));  
     layout  = pango_layout_new (context);  
     desc    = pango_font_description_new();  
   
     pango_font_description_set_size (desc, 40 * PANGO_SCALE);  
     pango_layout_set_font_description (layout, desc);  
     pango_layout_set_text (layout, buffer, strlen(buffer));  
   
     gc = gdk_gc_new (GTK_WIDGET(map)->window);  
   
     color.red = (0 > 50) ? 0xffff : 0;  
     color.green = 0;  
     color.blue = 0;  
   
     gdk_gc_set_rgb_fg_color (gc, &color);  
   
     /* faster / less flicker alternative:*/  
     gdk_draw_drawable (  
                        GTK_WIDGET(map)->window,  
                        GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(map)],  
                        priv->pixmap,  
                        0,0,  
                        0,0,  
                        width+10,width+10);  
   
     gdk_draw_layout(GTK_WIDGET(map)->window,  
                     gc,  
                     0, 0,  
                     layout);  
   
     /* set width and height */  
     pango_layout_get_pixel_size(layout, &width, &height);  
   
     g_free(buffer);  
     pango_font_description_free (desc);  
     g_object_unref (layout);  
     g_object_unref (gc);  
 }  
   
 void  
2838  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)
2839  {  {
2840      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2553  osm_gps_map_get_scale(OsmGpsMap *map) Line 2966  osm_gps_map_get_scale(OsmGpsMap *map)
2966      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);
2967  }  }
2968    
2969    #ifdef ENABLE_BALLOON
2970    void
2971    osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
2972                              OsmGpsMapBalloonCallback cb, gpointer data)
2973    {
2974        OsmGpsMapPrivate *priv;
2975    
2976        /* remove and previously installed balloon */
2977        osm_gps_map_clear_balloon (map);
2978    
2979        g_return_if_fail (OSM_IS_GPS_MAP (map));
2980        priv = map->priv;
2981    
2982        priv->balloon.coo->rlat = deg2rad(latitude);
2983        priv->balloon.coo->rlon = deg2rad(longitude);
2984        priv->balloon.valid = TRUE;
2985    
2986        priv->balloon.cb = cb;
2987        priv->balloon.data = data;
2988    
2989        // this redraws the map
2990        osm_gps_map_map_redraw_idle(map);
2991    }
2992    
2993    void
2994    osm_gps_map_clear_balloon (OsmGpsMap *map)
2995    {
2996        OsmGpsMapPrivate *priv;
2997    
2998        g_return_if_fail (OSM_IS_GPS_MAP (map));
2999        priv = map->priv;
3000    
3001        priv->balloon.valid = FALSE;
3002    
3003        osm_gps_map_map_redraw_idle(map);
3004    }
3005    #endif
3006    
3007    #ifdef ENABLE_OSD
3008    
3009    void
3010    osm_gps_map_redraw (OsmGpsMap *map)
3011    {
3012        osm_gps_map_map_redraw_idle(map);
3013    }
3014    
3015    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
3016        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
3017        return map->priv->osd;
3018    }
3019    
3020    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
3021        OsmGpsMapPrivate *priv;
3022    
3023        g_return_if_fail (OSM_IS_GPS_MAP (map));
3024    
3025        priv = map->priv;
3026        g_return_if_fail (!priv->osd);
3027    
3028        priv->osd = osd;
3029    }
3030    
3031    #endif
Legend:
Removed from v.55  
changed lines
  Added in v.77