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

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

revision 60 by harbaum, Mon Aug 17 19:44:00 2009 UTC revision 62 by harbaum, Tue Aug 18 20:33:08 2009 UTC
# Line 107  struct _OsmGpsMapPrivate Line 107  struct _OsmGpsMapPrivate
107          gpointer data;          gpointer data;
108      } balloon;      } balloon;
109    
110    #ifdef ENABLE_OSD
111        //the osd controls
112        struct {
113            GdkPixmap *backup;
114            gint backup_x, backup_y;
115            //        GdkPixbuf *pixbuf;
116        } osd;
117    #endif
118    
119      //additional images or tracks added to the map      //additional images or tracks added to the map
120      GSList *tracks;      GSList *tracks;
121      GSList *images;      GSList *images;
# Line 693  osm_gps_map_draw_balloon_shape (cairo_t Line 702  osm_gps_map_draw_balloon_shape (cairo_t
702      cairo_close_path (cr);      cairo_close_path (cr);
703  }  }
704    
 /* http://cairographics.org/samples/ */  
705  static void  static void
706  osm_gps_map_draw_balloon_int (OsmGpsMap *map)  osm_gps_map_draw_balloon_int (OsmGpsMap *map)
707  {  {
# Line 801  osm_gps_map_draw_balloon_int (OsmGpsMap Line 809  osm_gps_map_draw_balloon_int (OsmGpsMap
809              priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);              priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
810          }          }
811    
812            cairo_destroy(cr);
813    
814          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
815                                      x0, y0, BALLOON_WIDTH,                                      x0, y0, BALLOON_WIDTH,
816                                      BALLOON_HEIGHT + POINTER_HEIGHT);                                      BALLOON_HEIGHT + POINTER_HEIGHT);
# Line 903  osm_gps_map_tile_download_complete (Soup Line 913  osm_gps_map_tile_download_complete (Soup
913              }              }
914              else              else
915              {              {
916                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
917                              dl->folder);
918                    perror("perror:");
919              }              }
920          }          }
921    
# Line 1395  osm_gps_map_purge_cache (OsmGpsMap *map) Line 1407  osm_gps_map_purge_cache (OsmGpsMap *map)
1407     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);
1408  }  }
1409    
1410    #ifdef ENABLE_OSD
1411    /* position and extent of bounding box */
1412    #define OSD_X  (10)
1413    #define OSD_Y  (10)
1414    #define OSD_W  (80+5)
1415    #define OSD_H  (120+5)
1416    
1417    static void
1418    osm_gps_map_draw_osd_controls (OsmGpsMap *map, gint xoffset, gint yoffset)
1419    {
1420        /* xyz */
1421        OsmGpsMapPrivate *priv = map->priv;
1422    
1423        /* backup previous contents */
1424        if(!priv->osd.backup)
1425            priv->osd.backup = gdk_pixmap_new(priv->pixmap, OSD_W+2, OSD_H+2, -1);
1426    
1427        gint x = OSD_X + EXTRA_BORDER + xoffset;
1428        gint y = OSD_Y + EXTRA_BORDER + yoffset;
1429    
1430        /* create backup of background */
1431        gdk_draw_drawable(priv->osd.backup,
1432            GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],
1433                          priv->pixmap, x-1, y-1, 0, 0, OSD_W+2, OSD_H+2);
1434        priv->osd.backup_x = x-1;
1435        priv->osd.backup_y = y-1;
1436    
1437    #if 0
1438        /* create pixbuf for osd */
1439        if(!priv->osd.pixbuf)
1440            priv->osd.pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
1441                                              TRUE, 8, OSD_W, OSD_H);
1442        cairo_surface_t *surface =
1443            cairo_image_surface_create(CAIRO_FORMAT_ARGB32, OSD_W, OSD_H);
1444    
1445        /* fill with transparency */
1446        {
1447        cairo_t *cr = cairo_create(surface);
1448        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1449        cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
1450        cairo_paint(cr);
1451        cairo_destroy(cr);
1452        }
1453    #endif
1454    
1455    
1456    #ifdef USE_CAIRO
1457        //    cairo_t *cr = cairo_create(surface);
1458        cairo_t *cr = gdk_cairo_create(priv->pixmap);
1459    
1460    #define RAD  40
1461    #define TIP  35
1462    #define LEN  15
1463    #define WID  15
1464    
1465    #define Z_STEP   -5
1466    #define Z_RAD    15
1467    #define Z_TOP    2*RAD+Z_STEP
1468    #define Z_MID    Z_TOP+Z_RAD
1469    #define Z_BOT    Z_MID+Z_RAD
1470    #define Z_LEFT   Z_RAD
1471    #define Z_RIGHT  2*RAD-Z_RAD
1472    
1473        /* --------- the direction "pad" shape and shadow ----------- */
1474    
1475        cairo_move_to (cr, x+Z_LEFT+5,    y+Z_TOP+5);
1476        cairo_line_to (cr, x+Z_RIGHT+5,   y+Z_TOP+5);
1477        cairo_arc     (cr, x+Z_RIGHT+5,   y+Z_MID+5, Z_RAD, -M_PI/2,  M_PI/2);
1478        cairo_line_to (cr, x+Z_LEFT+5,    y+Z_BOT+5);
1479        cairo_arc     (cr, x+Z_LEFT+5,    y+Z_MID+5, Z_RAD,  M_PI/2, -M_PI/2);
1480        cairo_close_path (cr);
1481    
1482        cairo_set_source_rgba (cr, 0, 0, 0, 0.2);
1483        cairo_fill (cr);
1484        cairo_stroke (cr);
1485    
1486        cairo_arc (cr, x+RAD+5, y+RAD+5, RAD, 0, 2 * M_PI);
1487        cairo_close_path (cr);
1488    
1489        cairo_set_source_rgba (cr, 0, 0, 0, 0.2);
1490        cairo_fill (cr);
1491        cairo_stroke (cr);
1492    
1493    
1494        cairo_move_to (cr, x+Z_LEFT,    y+Z_TOP);
1495        cairo_line_to (cr, x+Z_RIGHT,   y+Z_TOP);
1496        cairo_arc     (cr, x+Z_RIGHT,   y+Z_MID, Z_RAD, -M_PI/2,  M_PI/2);
1497        cairo_line_to (cr, x+Z_LEFT,    y+Z_BOT);
1498        cairo_arc     (cr, x+Z_LEFT,    y+Z_MID, Z_RAD,  M_PI/2, -M_PI/2);
1499        cairo_close_path (cr);
1500    
1501        cairo_set_source_rgb (cr, 1, 1, 1);
1502        cairo_fill_preserve (cr);
1503        cairo_set_source_rgb (cr, 0.6, 0.6, 1);
1504        cairo_set_line_width (cr, 1);
1505        cairo_stroke (cr);
1506    
1507        cairo_arc (cr, x+RAD, y+RAD, RAD, 0, 2 * M_PI);
1508        cairo_close_path (cr);
1509    
1510        cairo_set_source_rgb (cr, 1, 1, 1);
1511        cairo_fill_preserve (cr);
1512        cairo_set_source_rgb (cr, 0.6, 0.6, 1);
1513        cairo_set_line_width (cr, 1);
1514        cairo_stroke (cr);
1515    
1516        /* ---------- the zoom pad shape and shadow  -------------- */
1517    
1518    
1519    
1520        /* left arrow/triangle */
1521        cairo_move_to (cr, x+RAD-TIP, y+RAD);
1522        cairo_rel_line_to (cr, +LEN, -WID/2);
1523        cairo_rel_line_to (cr,    0,   +WID);
1524        cairo_rel_line_to (cr, -LEN, -WID/2);
1525        cairo_close_path (cr);
1526    
1527        /* right arrow/triangle */
1528        cairo_move_to (cr, x+RAD+TIP, y+RAD);
1529        cairo_rel_line_to (cr, -LEN, -WID/2);
1530        cairo_rel_line_to (cr,    0,   +WID);
1531        cairo_rel_line_to (cr, +LEN, -WID/2);
1532        cairo_close_path (cr);
1533    
1534        /* top arrow/triangle */
1535        cairo_move_to (cr, x+RAD, y+RAD-TIP);
1536        cairo_rel_line_to (cr, -WID/2, +LEN);
1537        cairo_rel_line_to (cr,   +WID,    0);
1538        cairo_rel_line_to (cr, -WID/2, -LEN);
1539        cairo_close_path (cr);
1540    
1541        /* bottom arrow/triangle */
1542        cairo_move_to (cr, x+RAD, y+RAD+TIP);
1543        cairo_rel_line_to (cr, -WID/2, -LEN);
1544        cairo_rel_line_to (cr,   +WID,    0);
1545        cairo_rel_line_to (cr, -WID/2, +LEN);
1546        cairo_close_path (cr);
1547    
1548        cairo_set_source_rgb (cr, 0.6, 0.6, 1);
1549        cairo_fill_preserve (cr);
1550        cairo_set_line_width (cr, 0);
1551        cairo_set_source_rgba (cr, 0, 0, 0, 1);
1552        cairo_stroke (cr);
1553    
1554    
1555        cairo_destroy(cr);
1556    
1557    #else
1558    #warning "OSD control display lacks a non-cairo implementation!"
1559    #endif
1560    }
1561    
1562    static void
1563    osm_gps_map_osd_restore (OsmGpsMap *map)
1564    {
1565        OsmGpsMapPrivate *priv = map->priv;
1566    
1567        /* restore backup of previous contents */
1568        if(priv->osd.backup) {
1569            /* create backup of background */
1570            gdk_draw_drawable(priv->pixmap,
1571                GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],
1572                          priv->osd.backup, 0, 0,
1573                          priv->osd.backup_x, priv->osd.backup_y, OSD_W+2, OSD_H+2);
1574        }
1575    }
1576    
1577    #endif
1578    
1579  static gboolean  static gboolean
1580  osm_gps_map_map_redraw (OsmGpsMap *map)  osm_gps_map_map_redraw (OsmGpsMap *map)
1581  {  {
# Line 1426  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1607  osm_gps_map_map_redraw (OsmGpsMap *map)
1607      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1608      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1609      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1610    #ifdef ENABLE_OSD
1611        osm_gps_map_draw_osd_controls(map, 0, 0);
1612    #endif
1613    
1614      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1615      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
# Line 1461  osm_gps_map_init (OsmGpsMap *object) Line 1645  osm_gps_map_init (OsmGpsMap *object)
1645      priv->balloon.valid = FALSE;      priv->balloon.valid = FALSE;
1646      priv->balloon.cb = NULL;      priv->balloon.cb = NULL;
1647    
1648    #ifdef ENABLE_OSD
1649        priv->osd.backup = NULL;
1650    #endif
1651    
1652      priv->tracks = NULL;      priv->tracks = NULL;
1653      priv->images = NULL;      priv->images = NULL;
1654    
# Line 1621  osm_gps_map_dispose (GObject *object) Line 1809  osm_gps_map_dispose (GObject *object)
1809      g_free(priv->gps);      g_free(priv->gps);
1810      g_free(priv->balloon.coo);      g_free(priv->balloon.coo);
1811    
1812    #ifdef ENABLE_OSD
1813        if (priv->osd.backup)
1814            g_object_unref(priv->osd.backup);
1815    #endif
1816    
1817      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1818  }  }
1819    
# Line 1932  osm_gps_map_motion_notify (GtkWidget *wi Line 2125  osm_gps_map_motion_notify (GtkWidget *wi
2125      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2126      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2127    
2128    #ifdef ENABLE_OSD
2129        /* undo OSD */
2130        osm_gps_map_osd_restore (OSM_GPS_MAP(widget));
2131    
2132        /* draw new OSD */
2133        osm_gps_map_draw_osd_controls (OSM_GPS_MAP(widget),
2134                                       -priv->drag_mouse_dx,
2135                                       -priv->drag_mouse_dy);
2136    #endif
2137    
2138      gdk_draw_drawable (      gdk_draw_drawable (
2139                         widget->window,                         widget->window,
2140                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
# Line 2025  osm_gps_map_expose (GtkWidget *widget, G Line 2228  osm_gps_map_expose (GtkWidget *widget, G
2228                         event->area.x, event->area.y,                         event->area.x, event->area.y,
2229                         event->area.width, event->area.height);                         event->area.width, event->area.height);
2230    
2231    #ifdef ENABLE_OSD_OVL
2232        /* TODO: intersect with area */
2233        if (priv->osd.pixbuf)
2234        {
2235            //        gdk_draw_drawable (widget->window,
2236            //            widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2237            //            priv->osd.pixbuf, 0, 0,
2238            //            OSD_X, OSD_Y, OSD_W, OSD_H);
2239        }
2240    #endif
2241    
2242      return FALSE;      return FALSE;
2243  }  }
2244    
Legend:
Removed from v.60  
changed lines
  Added in v.62