Add:osd_core:New osd street_name to display... Guess what?

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1022 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index 8b0fb40..90d7ddd 100644 (file)
--- a/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -557,14 +557,20 @@ overlay_draw(struct graphics_priv *parent, struct graphics_priv *overlay, int wi
        GdkPixbuf *pixbuf,*pixbuf2;
        GtkWidget *widget=parent->widget;
        guchar *pixels1, *pixels2, *p1, *p2;
-       int x,y;
+       int x,y,w,h;
        int rowstride1,rowstride2;
        int n_channels1,n_channels2;
 
        if (! parent->drawable)
                return;
 
-       pixbuf=gdk_pixbuf_get_from_drawable(NULL, overlay->drawable, NULL, 0, 0, 0, 0, overlay->width, overlay->height);
+       w=overlay->width;
+       if (w < 0)
+               w+=parent->width;
+       h=overlay->height;
+       if (h < 0)
+               h+=parent->height;
+       pixbuf=gdk_pixbuf_get_from_drawable(NULL, overlay->drawable, NULL, 0, 0, 0, 0, w, h);
        pixbuf2=gdk_pixbuf_new(gdk_pixbuf_get_colorspace(pixbuf), TRUE, gdk_pixbuf_get_bits_per_sample(pixbuf),
                                gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
 
@@ -574,8 +580,8 @@ overlay_draw(struct graphics_priv *parent, struct graphics_priv *overlay, int wi
        pixels2=gdk_pixbuf_get_pixels (pixbuf2);
        n_channels1 = gdk_pixbuf_get_n_channels (pixbuf);
        n_channels2 = gdk_pixbuf_get_n_channels (pixbuf2);
-       for (y = 0 ; y < overlay->height ; y++) {
-               for (x = 0 ; x < overlay->width ; x++) {
+       for (y = 0 ; y < h ; y++) {
+               for (x = 0 ; x < w ; x++) {
                        p1 = pixels1 + y * rowstride1 + x * n_channels1;
                        p2 = pixels2 + y * rowstride2 + x * n_channels2;
                        p2[0]=p1[0];
@@ -592,15 +598,15 @@ overlay_draw(struct graphics_priv *parent, struct graphics_priv *overlay, int wi
                y+=parent->height;
        if (window) {
                if (overlay->background_ready)
-                       gdk_draw_drawable(parent->drawable, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], overlay->background, 0, 0, x, y, overlay->width, overlay->height);
+                       gdk_draw_drawable(parent->drawable, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], overlay->background, 0, 0, x, y, w, h);
        }
        else {
-               gdk_draw_drawable(overlay->background, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], parent->drawable, x, y, 0, 0, overlay->width, overlay->height);
+               gdk_draw_drawable(overlay->background, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], parent->drawable, x, y, 0, 0, w, h);
                overlay->background_ready=1;
        }
-       gdk_draw_pixbuf(parent->drawable, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], pixbuf2, 0, 0, x, y, overlay->width, overlay->height, GDK_RGB_DITHER_NONE, 0, 0);
+       gdk_draw_pixbuf(parent->drawable, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], pixbuf2, 0, 0, x, y, w, h, GDK_RGB_DITHER_NONE, 0, 0);
        if (window)
-               gdk_draw_drawable(widget->window, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], parent->drawable, x, y, x, y, overlay->width, overlay->height);
+               gdk_draw_drawable(widget->window, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], parent->drawable, x, y, x, y, w, h);
        g_object_unref(pixbuf);
        g_object_unref(pixbuf2);
 #if 0

diff --git a/navit/src/osd/core/osd_core.c b/navit/src/osd/core/osd_core.c
index 40ff502..588beda 100644 (file)
--- a/navit/src/osd/core/osd_core.c
+++ b/navit/src/osd/core/osd_core.c
@@ -18,6 +18,7 @@
 #include "color.h"
 #include "vehicle.h"
 #include "navigation.h"
+#include "track.h"
 #include "map.h"
 
 struct compass {
@@ -452,11 +453,126 @@ osd_navigation_new(struct navit *nav, struct osd_methods *meth, struct attr **at
        return (struct osd_priv *) this;
 }
 
+struct osd_street_name {
+       struct point p;
+       int w,h;
+       struct graphics *gr;
+       struct graphics_gc *bg;
+       struct graphics_gc *white;
+       struct graphics_font *font;
+       int active;
+       struct item item;
+};
+
+static void
+osd_street_name_draw(struct osd_street_name *this, struct navit *navit, struct vehicle *v)
+{
+       struct point p;
+       char distance[16];
+       int do_draw=0;
+       struct attr attr_name1, attr_name2;
+       char *name1=NULL,*name2=NULL;
+       struct tracking *tr=NULL;
+       struct map_rect *mr=NULL;
+       struct item *item=NULL;
+       char *name=NULL;
+
+       distance[0]='\0';
+       if (navit) 
+               tr=navit_get_tracking(navit);
+       if (tr)
+               item=tracking_get_current_item(tr);
+       dbg(1,"navit=%p tr=%p item=%p\n", navit, tr, item);
+       if (item) {
+               if (!item_is_equal(*item, this->item)) {
+                       do_draw=1;
+                       this->item=*item;
+                       mr=map_rect_new(item->map,NULL);
+                       item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
+                       if (item_attr_get(item, attr_street_name, &attr_name1))
+                               name1=map_convert_string(item->map, attr_name1.u.str);
+                       if (item_attr_get(item, attr_street_name_systematic, &attr_name2))
+                               name2=map_convert_string(item->map, attr_name2.u.str);
+                       printf("name1=%s name2=%s\n", name1, name2);
+                       map_rect_destroy(mr);
+                       if (name1 && name2)
+                               name=g_strdup_printf("%s/%s", name2,name1);
+                       else
+                               name=g_strdup(name1?name1:name2);
+                       map_convert_free(name1);
+                       map_convert_free(name2);
+                       this->active=1;
+               }
+       } else {
+               if (this->item.map || this->active)
+                       do_draw=1;
+               this->active=0;
+               memset(&this->item, 0, sizeof(this->item));
+               name=NULL;
+       }
+       if (do_draw) {
+               dbg(1,"name=%s\n", name);
+               graphics_draw_mode(this->gr, draw_mode_begin);
+               p.x=0;
+               p.y=0;
+               graphics_draw_rectangle(this->gr, this->bg, &p, 32767, 32767);
+               if (name) {
+                       p.x=2;
+                       p.y=12;
+                       graphics_draw_text(this->gr, this->white, NULL, this->font, name, &p, 0x10000, 0);
+               }
+               graphics_draw_mode(this->gr, draw_mode_end);
+       }
+}
+
+static void
+osd_street_name_init(struct osd_street_name *this, struct navit *nav)
+{
+       struct graphics *navit_gr;
+       struct color c;
+       navit_gr=navit_get_graphics(nav);
+       this->active=-1;
+       this->gr=graphics_overlay_new(navit_gr, &this->p, this->w, this->h);
+
+       this->bg=graphics_gc_new(this->gr);
+       c.r=0; c.g=0; c.b=0;
+       graphics_gc_set_foreground(this->bg, &c);
+
+       this->white=graphics_gc_new(this->gr);
+       c.r=65535; c.g=65535; c.b=65535;
+       graphics_gc_set_foreground(this->white, &c);
+
+       this->font=graphics_font_new(this->gr, 200, 1);
+       navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_street_name_draw), attr_position_coord_geo, this));
+
+       osd_street_name_draw(this, nav, NULL);
+}
+
+static struct osd_priv *
+osd_street_name_new(struct navit *nav, struct osd_methods *meth, struct attr **attrs)
+{
+       struct osd_street_name *this=g_new0(struct osd_street_name, 1);
+       struct attr *attr;
+       this->p.x=90;
+       this->p.y=-36;
+       this->w=150;
+       this->h=16;
+       attr=attr_search(attrs, NULL, attr_x);
+       if (attr)
+               this->p.x=attr->u.num;
+       attr=attr_search(attrs, NULL, attr_y);
+       if (attr)
+               this->p.y=attr->u.num;
+       navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_street_name_init), attr_navit, this));
+       return (struct osd_priv *) this;
+}
+
 void
 plugin_init(void)
 {
        plugin_register_osd_type("compass", osd_compass_new);
        plugin_register_osd_type("eta", osd_eta_new);
        plugin_register_osd_type("navigation", osd_navigation_new);
+       plugin_register_osd_type("street_name", osd_street_name_new);
 }
 

diff --git a/navit/src/track.c b/navit/src/track.c
index 0561817..42c2db5 100644 (file)
--- a/navit/src/track.c
+++ b/navit/src/track.c
@@ -85,6 +85,13 @@ tracking_get_current_attr(struct tracking *_this, enum attr_type type, struct at
        return result;
 }
 
+struct item *
+tracking_get_current_item(struct tracking *_this)
+{
+       if (! _this->curr_line || ! _this->curr_line->street)
+               return NULL;
+       return &_this->curr_line->street->item;
+}
 
 static void
 tracking_get_angles(struct tracking_line *tl)

diff --git a/navit/src/track.h b/navit/src/track.h
index d6885bc..69024ef 100644 (file)
--- a/navit/src/track.h
+++ b/navit/src/track.h
@@ -16,6 +16,7 @@ int tracking_update(struct tracking *tr, struct coord *c, int angle);
 struct tracking *tracking_new(struct mapset *ms);
 void tracking_set_mapset(struct tracking *this_, struct mapset *ms);
 int tracking_get_current_attr(struct tracking *_this, enum attr_type type, struct attr *attr);
+struct item *tracking_get_current_item(struct tracking *_this);
 void tracking_destroy(struct tracking *tr);
 /* end of prototypes */
 #ifdef __cplusplus