Add:Core:Support for FRA FRA NLS Setting
[navit-package] / navit / navit.c
index 468cd1d..eb92e8b 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * Navit, a modular navigation system.
- * Copyright (C) 2005-2008 Navit Team
+ * Copyright (C) 2005-2009 Navit Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -42,7 +42,6 @@
 #include "param.h"
 #include "menu.h"
 #include "graphics.h"
-#include "cursor.h"
 #include "popup.h"
 #include "data_window.h"
 #include "route.h"
 #include "speech.h"
 #include "track.h"
 #include "vehicle.h"
-#include "color.h"
 #include "layout.h"
 #include "log.h"
 #include "attr.h"
 #include "event.h"
 #include "file.h"
 #include "profile.h"
+#include "command.h"
 #include "navit_nls.h"
+#include "util.h"
+#include "messages.h"
+#include "vehicleprofile.h"
+#include "sunriset.h"
 
 /**
  * @defgroup navit the navit core instance. navit is the object containing nearly everything: A set of maps, one or more vehicle, a graphics object for rendering the map, a gui object for displaying the user interface, a route object, a navigation object and so on. Be warned that it is theoretically possible to have more than one navit object
 
 //! The navit_vehicule
 struct navit_vehicle {
-       int update;
-       /*! Limit of the update counter. See navit_add_vehicle */
-       int update_curr;
-       /*! Deprecated : Update counter itself. When it reaches 'update' counts, route is updated */
        int follow;
        /*! Limit of the follow counter. See navit_add_vehicle */
        int follow_curr;
@@ -78,9 +77,6 @@ struct navit_vehicle {
        int dir;
        int speed;
        struct coord last; /*< Position of the last update of this vehicle */
-       struct color c;
-       struct color *c2;
-       struct cursor *cursor;
        struct vehicle *vehicle;
        struct attr callback;
        int animate_cursor;
@@ -103,26 +99,25 @@ struct navit {
        int ready;
        struct window *win;
        struct displaylist *displaylist;
-       int cursor_flag;
        int tracking_flag;
        int orientation;
        int recentdest_count;
+       int osd_configuration;
        GList *vehicles;
        GList *windows_items;
        struct navit_vehicle *vehicle;
        struct callback_list *attr_cbl;
-       int pid;
-       struct callback *nav_speech_cb;
-       struct callback *roadbook_callback;
-       struct callback *popup_callback;
+       struct callback *nav_speech_cb, *roadbook_callback, *popup_callback, *route_cb;
        struct datawindow *roadbook_window;
        struct map *bookmark;
        struct map *former_destination;
        GHashTable *bookmarks_hash;
        struct point pressed, last, current;
        int button_pressed,moved,popped,zoomed;
-       time_t last_moved;
        int center_timeout;
+       int autozoom_secs;
+       int autozoom_min;
+       int autozoom_active;
        struct event_timeout *button_timeout, *motion_timeout;
        struct callback *motion_timeout_callback;
        int ignore_button;
@@ -134,8 +129,15 @@ struct navit {
        int w,h;
        int drag_bitmap;
        int use_mousewheel;
-       GHashTable *commands;
+       struct messagelist *messages;
        struct callback *resize_callback,*button_callback,*motion_callback;
+       struct vehicleprofile *vehicleprofile;
+       GList *vehicleprofiles;
+       int pitch;
+       int follow_cursor;
+       int prevTs;
+       int graphics_flags;
+       int zoom_min, zoom_max;
 };
 
 struct gui *main_loop_gui;
@@ -150,6 +152,13 @@ struct attr_iter {
 static void navit_vehicle_update(struct navit *this_, struct navit_vehicle *nv);
 static void navit_vehicle_draw(struct navit *this_, struct navit_vehicle *nv, struct point *pnt);
 static int navit_add_vehicle(struct navit *this_, struct vehicle *v);
+static int navit_set_attr_do(struct navit *this_, struct attr *attr, int init);
+static int navit_get_cursor_pnt(struct navit *this_, struct point *p, int *dir);
+static void navit_set_cursors(struct navit *this_);
+static void navit_cmd_zoom_to_route(struct navit *this);
+static void navit_cmd_set_center_cursor(struct navit *this_);
+static void navit_cmd_announcer_toggle(struct navit *this_);
+static void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv);
 
 void
 navit_add_mapset(struct navit *this_, struct mapset *ms)
@@ -174,8 +183,8 @@ navit_get_tracking(struct navit *this_)
        return this_->tracking;
 }
 
-void
-navit_draw(struct navit *this_)
+static void
+navit_draw_async(struct navit *this_, int async)
 {
        GList *l;
        struct navit_vehicle *nv;
@@ -191,38 +200,70 @@ navit_draw(struct navit *this_)
                navit_vehicle_draw(this_, nv, NULL);
                l=g_list_next(l);
        }
-       graphics_draw(this_->gra, this_->displaylist, this_->mapsets, this_->trans, this_->layout_current);
-#if 0
-       {
-       int i;
-       for (i = 0 ; i < 500 ; i++)
-               graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current, 1);
-       exit(0);
-       }
-#endif
+       graphics_draw(this_->gra, this_->displaylist, this_->mapsets->data, this_->trans, this_->layout_current, async, NULL, this_->graphics_flags|1);
 }
 
 void
+navit_draw(struct navit *this_)
+{
+       navit_draw_async(this_, 0);
+}
+
+int
+navit_get_ready(struct navit *this_)
+{
+       return this_->ready;
+}
+
+
+
+void
 navit_draw_displaylist(struct navit *this_)
 {
        if (this_->ready == 3)
-               graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current, 1);
+               graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current, this_->graphics_flags|1);
+}
+
+static void
+navit_redraw_route(struct navit *this_, struct route *route, struct attr *attr)
+{
+       int updated;
+       if (attr->type != attr_route_status)
+               return;
+       updated=attr->u.num;
+       if (this_->ready != 3)
+               return;
+       if (updated != route_status_path_done_new)
+               return;
+       if (this_->vehicle) {
+               if (this_->vehicle->follow_curr == 1)
+                       return;
+               if (this_->vehicle->follow_curr <= this_->vehicle->follow)
+                       this_->vehicle->follow_curr=this_->vehicle->follow;
+       }
+       navit_draw(this_);
 }
 
 void
 navit_handle_resize(struct navit *this_, int w, int h)
 {
        struct map_selection sel;
-       memset(&sel, 0, sizeof(sel));
-       this_->w=w;
-       this_->h=h;
-       sel.u.p_rect.rl.x=w;
-       sel.u.p_rect.rl.y=h;
-       transform_set_screen_selection(this_->trans, &sel);
+       int callback=(this_->ready == 1);
        this_->ready |= 2;
-       graphics_set_rect(this_->gra, &sel.u.p_rect);
+       if (this_->w != w || this_->h != h) {
+               memset(&sel, 0, sizeof(sel));
+               this_->w=w;
+               this_->h=h;
+               sel.u.p_rect.rl.x=w;
+               sel.u.p_rect.rl.y=h;
+               transform_set_screen_selection(this_->trans, &sel);
+               graphics_init(this_->gra);
+               graphics_set_rect(this_->gra, &sel.u.p_rect);
+       }
        if (this_->ready == 3)
                navit_draw(this_);
+       if (callback)
+               callback_list_call_attr_1(this_->attr_cbl, attr_graphics_ready, this_);
 }
 
 static void
@@ -256,10 +297,13 @@ navit_popup(void *data)
 }
 
 
-void
+int
 navit_ignore_button(struct navit *this_)
 {
+       if (this_->ignore_button)
+               return 1;
        this_->ignore_button=1;
+       return 0;
 }
 
 void
@@ -276,14 +320,16 @@ update_transformation(struct transformation *tr, struct point *old, struct point
        int yaw;
        double angleo,anglen;
 
-       transform_reverse(tr, old, &co);
+       if (!transform_reverse(tr, old, &co))
+               return;
        if (rot) {
                angleo=atan2(old->y-rot->y, old->x-rot->x)*180/M_PI;
                anglen=atan2(new->y-rot->y, new->x-rot->x)*180/M_PI;
                yaw=transform_get_yaw(tr)+angleo-anglen;
                transform_set_yaw(tr, yaw % 360);
        }
-       transform_reverse(tr, new, &cn);
+       if (!transform_reverse(tr, new, &cn))
+               return;
        cp=transform_get_center(tr);
        c.x=cp->x+co.x-cn.x;
        c.y=cp->y+co.y-cn.y;
@@ -291,12 +337,22 @@ update_transformation(struct transformation *tr, struct point *old, struct point
        transform_set_center(tr, &c);
 }
 
+static void
+navit_set_timeout(struct navit *this_)
+{
+       struct attr follow;
+       follow.type=attr_follow;
+       follow.u.num=this_->center_timeout;
+       navit_set_attr(this_, &follow);
+}
+
 int
 navit_handle_button(struct navit *this_, int pressed, int button, struct point *p, struct callback *popup_callback)
 {
        int border=16;
 
-       callback_list_call_attr_4(this_->attr_cbl, attr_button, this_, (void *)pressed, (void *)button, p);
+       dbg(1,"enter %d %d (ignore %d)\n",pressed,button,this_->ignore_button);
+       callback_list_call_attr_4(this_->attr_cbl, attr_button, this_, GINT_TO_POINTER(pressed), GINT_TO_POINTER(button), p);
        if (this_->ignore_button) {
                this_->ignore_button=0;
                return 0;
@@ -313,7 +369,7 @@ navit_handle_button(struct navit *this_, int pressed, int button, struct point *
                                this_->button_timeout=event_add_timeout(500, 0, popup_callback);
                }
                if (button == 2)
-                       navit_set_center_screen(this_, p);
+                       navit_set_center_screen(this_, p, 1);
                if (button == 3)
                        popup(this_, button, p);
                if (button == 4 && this_->use_mousewheel) {
@@ -325,15 +381,13 @@ navit_handle_button(struct navit *this_, int pressed, int button, struct point *
                        navit_zoom_out(this_, 2, p);
                }
        } else {
+
                this_->button_pressed=0;
                if (this_->button_timeout) {
                        event_remove_timeout(this_->button_timeout);
                        this_->button_timeout=NULL;
                        if (! this_->moved && ! transform_within_border(this_->trans, p, border)) {
-                               if (!this_->zoomed) {
-                                       this_->last_moved = time(NULL);
-                               }
-                               navit_set_center_screen(this_, p);
+                               navit_set_center_screen(this_, p, !this_->zoomed);
                        }
                }
                if (this_->motion_timeout) {
@@ -351,9 +405,8 @@ navit_handle_button(struct navit *this_, int pressed, int button, struct point *
 #endif
                        graphics_draw_drag(this_->gra, NULL);
                        graphics_overlay_disable(this_->gra, 0);
-                       if (!this_->zoomed) {
-                               this_->last_moved = time(NULL);
-                       }
+                       if (!this_->zoomed) 
+                               navit_set_timeout(this_);
                        navit_draw(this_);
                } else
                        return 1;
@@ -365,6 +418,7 @@ static void
 navit_button(void *data, int pressed, int button, struct point *p)
 {
        struct navit *this=data;
+       dbg(1,"enter %d %d ignore %d\n",pressed,button,this->ignore_graphics_events);
        if (!this->ignore_graphics_events) {
                if (! this->popup_callback)
                        this->popup_callback=callback_new_1(callback_cast(navit_popup), this);
@@ -408,7 +462,8 @@ navit_motion_timeout(struct navit *this_)
 #if 0
                graphics_displaylist_move(this_->displaylist, dx, dy);
 #endif
-               graphics_displaylist_draw(this_->gra, this_->displaylist, tr, this_->layout_current, 0);
+               graphics_draw_cancel(this_->gra, this_->displaylist);
+               graphics_displaylist_draw(this_->gra, this_->displaylist, tr, this_->layout_current, this_->graphics_flags);
                transform_destroy(tr);
                this_->moved=1;
        }
@@ -425,6 +480,7 @@ navit_handle_motion(struct navit *this_, struct point *p)
                dx=(p->x-this_->pressed.x);
                dy=(p->y-this_->pressed.y);
                if (dx < -8 || dx > 8 || dy < -8 || dy > 8) {
+                       this_->moved=1;
                        if (this_->button_timeout) {
                                event_remove_timeout(this_->button_timeout);
                                this_->button_timeout=NULL;
@@ -447,9 +503,13 @@ navit_motion(void *data, struct point *p)
 }
 
 static void
-navit_scale(struct navit *this_, long scale, struct point *p)
+navit_scale(struct navit *this_, long scale, struct point *p, int draw)
 {
        struct coord c1, c2, *center;
+       if (scale < this_->zoom_min)
+               scale=this_->zoom_min;
+       if (scale > this_->zoom_max)
+               scale=this_->zoom_max;
        if (p)
                transform_reverse(this_->trans, p, &c1);
        transform_set_scale(this_->trans, scale);
@@ -459,7 +519,61 @@ navit_scale(struct navit *this_, long scale, struct point *p)
                center->x += c1.x - c2.x;
                center->y += c1.y - c2.y;
        }
-       navit_draw(this_);
+       if (draw)
+               navit_draw(this_);
+}
+
+/**
+ * @brief Automatically adjusts zoom level
+ *
+ * This function automatically adjusts the current
+ * zoom level according to the current speed.
+ *
+ * @param this_ The navit struct
+ * @param center The "immovable" point - i.e. the vehicles position if we're centering on the vehicle
+ * @param speed The vehicles speed in meters per second
+ * @param dir The direction into which the vehicle moves
+ */
+static void
+navit_autozoom(struct navit *this_, struct coord *center, int speed, int draw)
+{
+       struct point pc;
+       int distance,w,h;
+       double new_scale;
+       long scale;
+
+       if (! this_->autozoom_active) {
+               return;
+       }
+
+       distance = speed * this_->autozoom_secs;
+
+       transform_get_size(this_->trans, &w, &h);
+       transform(this_->trans, transform_get_projection(this_->trans), center, &pc, 1, 0, 0, NULL);
+       scale = transform_get_scale(this_->trans);
+
+       /* We make sure that the point we want to see is within a certain range
+        * around the vehicle. The radius of this circle is the size of the
+        * screen. This doesn't necessarily mean the point is visible because of
+        * perspective etc. Quite rough, but should be enough. */
+       
+       if (w > h) {
+               new_scale = (double)distance / h * 16; 
+       } else {
+               new_scale = (double)distance / w * 16; 
+       }
+
+       if (abs(new_scale - scale) < 2) { 
+               return; // Smoothing
+       }
+       
+       if (new_scale >= this_->autozoom_min) {
+               navit_scale(this_, (long)new_scale, &pc, 0);
+       } else {
+               if (scale != this_->autozoom_min) {
+                       navit_scale(this_, this_->autozoom_min, &pc, 0);
+               }
+       }
 }
 
 /**
@@ -476,7 +590,7 @@ navit_zoom_in(struct navit *this_, int factor, struct point *p)
        long scale=transform_get_scale(this_->trans)/factor;
        if (scale < 1)
                scale=1;
-       navit_scale(this_, scale, p);
+       navit_scale(this_, scale, p, 1);
 }
 
 /**
@@ -491,9 +605,42 @@ void
 navit_zoom_out(struct navit *this_, int factor, struct point *p)
 {
        long scale=transform_get_scale(this_->trans)*factor;
-       navit_scale(this_, scale, p);
+       navit_scale(this_, scale, p, 1);
+}
+
+static int
+navit_cmd_zoom_in(struct navit *this_)
+{
+       struct point p;
+       if (this_->vehicle && this_->vehicle->follow_curr == 1 && navit_get_cursor_pnt(this_, &p, NULL)) {
+               navit_zoom_in(this_, 2, &p);
+               this_->vehicle->follow_curr=this_->vehicle->follow;
+       } else
+               navit_zoom_in(this_, 2, NULL);
+       return 0;
+}
+
+static int
+navit_cmd_zoom_out(struct navit *this_)
+{
+       struct point p;
+       if (this_->vehicle && this_->vehicle->follow_curr == 1 && navit_get_cursor_pnt(this_, &p, NULL)) {
+               navit_zoom_out(this_, 2, &p);
+               this_->vehicle->follow_curr=this_->vehicle->follow;
+       } else
+               navit_zoom_out(this_, 2, NULL);
+       return 0;
 }
 
+static struct command_table commands[] = {
+       {"zoom_in",command_cast(navit_cmd_zoom_in)},
+       {"zoom_out",command_cast(navit_cmd_zoom_out)},
+       {"zoom_to_route",command_cast(navit_cmd_zoom_to_route)},
+       {"set_center_cursor",command_cast(navit_cmd_set_center_cursor)},
+       {"announcer_toggle",command_cast(navit_cmd_announcer_toggle)},
+};
+       
+
 struct navit *
 navit_new(struct attr *parent, struct attr **attrs)
 {
@@ -503,80 +650,46 @@ navit_new(struct attr *parent, struct attr **attrs)
        struct coord_geo g;
        enum projection pro=projection_mg;
        int zoom = 256;
-       FILE *f;
        g.lat=53.13;
        g.lng=11.70;
 
        this_->self.type=attr_navit;
        this_->self.u.navit=this_;
        this_->attr_cbl=callback_list_new();
-       main_add_navit(this_);
-
-#if !defined(_WIN32) && !defined(__CEGCC__)
-       f=popen("pidof /usr/bin/ipaq-sleep","r");
-       if (f) {
-               fscanf(f,"%d",&this_->pid);
-               dbg(1,"ipaq_sleep pid=%d\n", this_->pid);
-               pclose(f);
-       }
-#endif
 
        this_->bookmarks_hash=g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
-       this_->cursor_flag=1;
        this_->orientation=-1;
        this_->tracking_flag=1;
        this_->recentdest_count=10;
+       this_->osd_configuration=-1;
 
-       this_->last_moved = 0;
        this_->center_timeout = 10;
        this_->use_mousewheel = 1;
-
-       for (;*attrs; attrs++) {
-               switch((*attrs)->type) {
-               case attr_zoom:
-                       zoom=(*attrs)->u.num;
-                       break;
-               case attr_center:
-                       g=*((*attrs)->u.coord_geo);
-                       break;
-               case attr_cursor:
-                       this_->cursor_flag=!!(*attrs)->u.num;
-                       break;
-               case attr_orientation:
-                       this_->orientation=(*attrs)->u.num;
-                       break;
-               case attr_tracking:
-                       this_->tracking_flag=!!(*attrs)->u.num;
-                       break;
-               case attr_recent_dest:
-                       this_->recentdest_count=(*attrs)->u.num;
-                       break;
-               case attr_drag_bitmap:
-                       this_->drag_bitmap=!!(*attrs)->u.num;
-                       break;
-               case attr_use_mousewheel:
-                       this_->use_mousewheel=!!(*attrs)->u.num;
-                       break;
-               case attr_timeout:
-                       this_->center_timeout = (*attrs)->u.num;
-                       break;
-               default:
-                       dbg(0, "Unexpected attribute %x\n",(*attrs)->type);
-                       break;
-               }
-       }
+       this_->autozoom_secs = 10;
+       this_->autozoom_min = 7;
+       this_->autozoom_active = 0;
+       this_->zoom_min = 1;
+       this_->zoom_max = 2097152;
+       this_->follow_cursor = 1;
+
+       this_->trans = transform_new();
        transform_from_geo(pro, &g, &co);
        center.x=co.x;
        center.y=co.y;
        center.pro = pro;
+       
+       this_->prevTs=0;
 
-       this_->trans=transform_new();
        transform_setup(this_->trans, &center, zoom, (this_->orientation != -1) ? this_->orientation : 0);
+       for (;*attrs; attrs++) {
+               navit_set_attr_do(this_, *attrs, 1);
+       }
        this_->displaylist=graphics_displaylist_new();
-       this_->commands=g_hash_table_new(g_str_hash, g_str_equal);
-       navit_command_register(this_, "zoom_in", callback_new_3(callback_cast(navit_zoom_in), this_, (void *)2, NULL));
-       navit_command_register(this_, "zoom_out", callback_new_3(callback_cast(navit_zoom_out), this_, (void *)2, NULL));
+       command_add_table(this_->attr_cbl, commands, sizeof(commands)/sizeof(struct command_table), this_);
+
+       this_->messages = messagelist_new(attrs);
+       
        return this_;
 }
 
@@ -597,6 +710,18 @@ navit_set_gui(struct navit *this_, struct gui *gui)
        return 1;
 }
 
+void 
+navit_add_message(struct navit *this_, char *message)
+{
+       message_new(this_->messages, message);
+}
+
+struct message
+*navit_get_messages(struct navit *this_)
+{
+       return message_get(this_->messages);
+}
+
 static int
 navit_set_graphics(struct navit *this_, struct graphics *gra)
 {
@@ -618,6 +743,18 @@ navit_get_graphics(struct navit *this_)
        return this_->gra;
 }
 
+struct vehicleprofile *
+navit_get_vehicleprofile(struct navit *this_)
+{
+       return this_->vehicleprofile;
+}
+
+GList *
+navit_get_vehicleprofiles(struct navit *this_)
+{
+       return this_->vehicleprofiles;
+}
+
 static void
 navit_projection_set(struct navit *this_, enum projection pro)
 {
@@ -703,7 +840,7 @@ new_file:
        f=fopen(file, "a");
        if (f) {
                if (c) {
-                       prostr = projection_to_name(c->pro);
+                       prostr = projection_to_name(c->pro,NULL);
                        fprintf(f,"%s%s%s0x%x %s0x%x type=%s label=\"%s\"\n",
                                 prostr, *prostr ? ":" : "", 
                                 c->x >= 0 ? "":"-", c->x >= 0 ? c->x : -c->x, 
@@ -711,8 +848,8 @@ new_file:
                                 type, description);
                } else
                        fprintf(f,"\n");
-               fclose(f);
        }
+       fclose(f);
 }
 
 /*
@@ -787,6 +924,7 @@ navit_get_center_file(gboolean create)
 static void
 navit_set_center_from_file(struct navit *this_, char *file)
 {
+#ifndef HAVE_API_ANDROID
        FILE *f;
        char *line = NULL;
 
@@ -806,6 +944,7 @@ navit_set_center_from_file(struct navit *this_, char *file)
                free(line);
        }
        return;
+#endif
 }
  
 static void
@@ -837,7 +976,7 @@ navit_write_center_to_file(struct navit *this_, char *file)
  * @returns nothing
  */
 void
-navit_set_destination(struct navit *this_, struct pcoord *c, const char *description)
+navit_set_destination(struct navit *this_, struct pcoord *c, const char *description, int async)
 {
        if (c) {
                this_->destination=*c;
@@ -849,11 +988,7 @@ navit_set_destination(struct navit *this_, struct pcoord *c, const char *descrip
        g_free(destination_file);
        callback_list_call_attr_0(this_->attr_cbl, attr_destination);
        if (this_->route) {
-               route_set_destination(this_->route, c);
-               if (this_->navigation) {
-                       navigation_flush(this_->navigation);
-                       navigation_update(this_->navigation, this_->route);
-               }
+               route_set_destination(this_->route, c, async);
 
                if (this_->ready == 3)
                        navit_draw(this_);
@@ -954,14 +1089,14 @@ navit_add_former_destinations_from_file(struct navit *this_)
        pc.x=c.x;
        pc.y=c.y;
        if (valid) {
-               route_set_destination(this_->route, &pc);
+               route_set_destination(this_->route, &pc, 1);
                this_->destination=pc;
                this_->destination_valid=1;
        }
 }
 
 
-static void
+void
 navit_textfile_debug_log(struct navit *this_, const char *fmt, ...)
 {
        va_list ap;
@@ -970,7 +1105,7 @@ navit_textfile_debug_log(struct navit *this_, const char *fmt, ...)
        if (this_->textfile_debug_log && this_->vehicle) {
                str1=g_strdup_vprintf(fmt, ap);
                str2=g_strdup_printf("0x%x 0x%x%s%s\n", this_->vehicle->coord.x, this_->vehicle->coord.y, strlen(str1) ? " " : "", str1);
-               log_write(this_->textfile_debug_log, str2, strlen(str2));
+               log_write(this_->textfile_debug_log, str2, strlen(str2), 0);
                g_free(str2);
                g_free(str1);
        }
@@ -989,6 +1124,36 @@ navit_say(struct navit *this_, char *text)
        speech_say(this_->speech, text);
 }
 
+/**
+ * @brief Toggles the navigation announcer for navit
+ * @param this_ The navit object
+ */
+static void
+navit_cmd_announcer_toggle(struct navit *this_)
+{
+    struct attr attr, speechattr;
+
+    // search for the speech attribute
+    if(!navit_get_attr(this_, attr_speech, &speechattr, NULL))
+        return;
+    // find out if the corresponding attribute attr_active has been set
+    if(speech_get_attr(speechattr.u.speech, attr_active, &attr, NULL)) {
+        // flip it then...
+        attr.u.num = !attr.u.num;
+    } else {
+        // otherwise disable it because voice is enabled by default
+        attr.type = attr_active;
+        attr.u.num = 0;
+    }
+
+    // apply the new state
+    if(!speech_set_attr(speechattr.u.speech, &attr))
+        return;
+
+    // announce that the speech attribute has changed
+    callback_list_call_attr_0(this_->attr_cbl, attr_speech);
+}
+
 void
 navit_speak(struct navit *this_)
 {
@@ -1012,6 +1177,7 @@ navit_speak(struct navit *this_)
                while ((item=map_rect_get_item(mr)) && (item->type == type_nav_position || item->type == type_nav_none));
                if (item && item_attr_get(item, attr_navigation_speech, &attr)) {
                        speech_say(this_->speech, attr.u.str);
+                       navit_add_message(this_, attr.u.str);
                        navit_textfile_debug_log(this_, "type=announcement label=\"%s\"", attr.u.str);
                }
                map_rect_destroy(mr);
@@ -1043,6 +1209,9 @@ navit_window_roadbook_update(struct navit *this_)
                        attr.u.str=NULL;
                        if (item->type != type_nav_position) {
                                item_attr_get(item, attr_navigation_long, &attr);
+                               if (attr.u.str == NULL) {
+                                       continue;
+                               }
                                dbg(2, "Command='%s'\n", attr.u.str);
                                param[0].value=g_strdup(attr.u.str);
                        } else
@@ -1117,7 +1286,7 @@ navit_window_roadbook_destroy(struct navit *this_)
 void
 navit_window_roadbook_new(struct navit *this_)
 {
-       if (this_->roadbook_callback || this_->roadbook_window) {
+       if (!this_->gui || this_->roadbook_callback || this_->roadbook_window) {
                return;
        }
 
@@ -1132,9 +1301,9 @@ navit_init(struct navit *this_)
 {
        struct mapset *ms;
        struct map *map;
-       GList *l;
-       struct navit_vehicle *nv;
+       int callback;
 
+       dbg(2,"enter gui %p graphics %p\n",this_->gui,this_->gra);
        if (!this_->gui) {
                dbg(0,"no gui\n");
                navit_destroy(this_);
@@ -1145,6 +1314,7 @@ navit_init(struct navit *this_)
                navit_destroy(this_);
                return;
        }
+       dbg(2,"Connecting gui to graphics\n");
        if (gui_set_graphics(this_->gui, this_->gra)) {
                struct attr attr_type_gui, attr_type_graphics;
                gui_get_attr(this_->gui, attr_type, &attr_type_gui, NULL);
@@ -1156,19 +1326,10 @@ navit_init(struct navit *this_)
                navit_destroy(this_);
                return;
        }
-       graphics_init(this_->gra);
-#if 0
-       l=this_->vehicles;
-       while (l) {
-               dbg(1,"parsed one vehicle\n");
-               nv=l->data;
-               nv->callback.type=attr_callback;
-               nv->callback.u.callback=callback_new_2(callback_cast(navit_vehicle_update), this_, nv);
-               vehicle_add_attr(nv->vehicle, &nv->callback);
-               vehicle_set_attr(nv->vehicle, &this_->self, NULL);
-               l=g_list_next(l);
-       }
-#endif
+       dbg(2,"Initializing graphics\n");
+       dbg(2,"Setting Vehicle\n");
+       navit_set_vehicle(this_, this_->vehicle);
+       dbg(2,"Adding dynamic maps to mapset %p\n",this_->mapsets);
        if (this_->mapsets) {
                ms=this_->mapsets->data;
                if (this_->route) {
@@ -1201,10 +1362,22 @@ navit_init(struct navit *this_)
                navit_add_bookmarks_from_file(this_);
                navit_add_former_destinations_from_file(this_);
        }
-       if (this_->navigation && this_->speech) {
-               this_->nav_speech_cb=callback_new_1(callback_cast(navit_speak), this_);
-               navigation_register_callback(this_->navigation, attr_navigation_speech, this_->nav_speech_cb);
+       if (this_->route) {
+               struct attr callback;
+               this_->route_cb=callback_new_attr_1(callback_cast(navit_redraw_route), attr_route_status, this_);
+               callback.type=attr_callback;
+               callback.u.callback=this_->route_cb;
+               route_add_attr(this_->route, &callback);
        }
+       if (this_->navigation) {
+               if (this_->speech) {
+                       this_->nav_speech_cb=callback_new_1(callback_cast(navit_speak), this_);
+                       navigation_register_callback(this_->navigation, attr_navigation_speech, this_->nav_speech_cb);
+               }
+               if (this_->route)
+                       navigation_set_route(this_->navigation, this_->route);
+       }
+       dbg(2,"Setting Center\n");
        char *center_file = navit_get_center_file(FALSE);
        navit_set_center_from_file(this_, center_file);
        g_free(center_file);
@@ -1221,53 +1394,70 @@ navit_init(struct navit *this_)
        navit_window_roadbook_new(this_);
        navit_window_items_new(this_);
 #endif
+
+       messagelist_init(this_->messages);
+
+       navit_set_cursors(this_);
+
        callback_list_call_attr_1(this_->attr_cbl, attr_navit, this_);
+       callback=(this_->ready == 2);
        this_->ready|=1;
+       dbg(2,"ready=%d\n",this_->ready);
        if (this_->ready == 3)
                navit_draw(this_);
+       if (callback)
+               callback_list_call_attr_1(this_->attr_cbl, attr_graphics_ready, this_);
+#if 0
+       routech_test(this_);
+#endif
 }
 
 void
-navit_zoom_to_route(struct navit *this_)
+navit_zoom_to_route(struct navit *this_, int orientation)
 {
        struct map *map;
-       struct map_rect *mr;
+       struct map_rect *mr=NULL;
        struct item *item;
-       struct coord c,*ct;
+       struct coord c;
        struct coord_rect r;
        int count=0,scale=16;
        if (! this_->route)
                return;
+       dbg(1,"enter\n");
        map=route_get_map(this_->route);
-       if (! map)
-               return;
-       mr=map_rect_new(map, NULL);
-       if (! mr)
-               return;
-       while ((item=map_rect_get_item(mr))) {
-               while (item_coord_get(item, &c, 1)) {
-                       if (!count) 
-                               r.lu=r.rl=c;
-                       else
-                               coord_rect_extend(&r, &c);      
-                       count++;
+       dbg(1,"map=%p\n",map);
+       if (map)
+               mr=map_rect_new(map, NULL);
+       dbg(1,"mr=%p\n",mr);
+       if (mr) {
+               while ((item=map_rect_get_item(mr))) {
+                       dbg(1,"item=%s\n", item_to_name(item->type));
+                       while (item_coord_get(item, &c, 1)) {
+                               dbg(1,"coord\n");
+                               if (!count) 
+                                       r.lu=r.rl=c;
+                               else
+                                       coord_rect_extend(&r, &c);      
+                               count++;
+                       }
                }
        }
        if (! count)
                return;
        c.x=(r.rl.x+r.lu.x)/2;
        c.y=(r.rl.y+r.lu.y)/2;
-       dbg(0,"count=%d\n",count);
-       ct=transform_center(this_->trans);
-       *ct=c;
-       dbg(0,"%x,%x-%x,%x\n", r.rl.x,r.rl.y,r.lu.x,r.lu.y);
+       dbg(1,"count=%d\n",count);
+       if (orientation != -1)
+               transform_set_yaw(this_->trans, orientation);
+       transform_set_center(this_->trans, &c);
+       dbg(1,"%x,%x-%x,%x\n", r.rl.x,r.rl.y,r.lu.x,r.lu.y);
        while (scale < 1<<20) {
                struct point p1,p2;
                transform_set_scale(this_->trans, scale);
                transform_setup_source_rect(this_->trans);
                transform(this_->trans, transform_get_projection(this_->trans), &r.lu, &p1, 1, 0, 0, NULL);
                transform(this_->trans, transform_get_projection(this_->trans), &r.rl, &p2, 1, 0, 0, NULL);
-               dbg(0,"%d,%d-%d,%d\n",p1.x,p1.y,p2.x,p2.y);
+               dbg(1,"%d,%d-%d,%d\n",p1.x,p1.y,p2.x,p2.y);
                if (p1.x < 0 || p2.x < 0 || p1.x > this_->w || p2.x > this_->w ||
                    p1.y < 0 || p2.y < 0 || p1.y > this_->h || p2.y > this_->h)
                        scale*=2;
@@ -1276,9 +1466,16 @@ navit_zoom_to_route(struct navit *this_)
        
        }
        if (this_->ready == 3)
-               navit_draw(this_);
+               navit_draw_async(this_,0);
 }
 
+static void
+navit_cmd_zoom_to_route(struct navit *this)
+{
+       navit_zoom_to_route(this, 0);
+}
+
+
 /**
  * Change the current zoom level
  *
@@ -1287,7 +1484,7 @@ navit_zoom_to_route(struct navit *this_)
  * @returns nothing
  */
 void
-navit_set_center(struct navit *this_, struct pcoord *center)
+navit_set_center(struct navit *this_, struct pcoord *center, int set_timeout)
 {
        struct coord *c=transform_center(this_->trans);
        struct coord c1,c2;
@@ -1301,12 +1498,14 @@ navit_set_center(struct navit *this_, struct pcoord *center)
                c2.y = center->y;
        }
        *c=c2;
+       if (set_timeout) 
+               navit_set_timeout(this_);
        if (this_->ready == 3)
                navit_draw(this_);
 }
 
 static void
-navit_set_center_coord_screen(struct navit *this_, struct coord *c, struct point *p)
+navit_set_center_coord_screen(struct navit *this_, struct coord *c, struct point *p, int set_timeout)
 {
        int width, height;
        struct point po;
@@ -1315,26 +1514,103 @@ navit_set_center_coord_screen(struct navit *this_, struct coord *c, struct point
        po.x=width/2;
        po.y=height/2;
        update_transformation(this_->trans, &po, p, NULL);
+       if (set_timeout)
+               navit_set_timeout(this_);
 }
 
+/**
+ * Links all vehicles to a cursor depending on the current profile.
+ *
+ * @param this_ A navit instance
+ * @author Ralph Sennhauser (10/2009)
+ */
 static void
-navit_set_center_cursor(struct navit *this_, struct coord *cursor, int dir, int xpercent, int ypercent)
+navit_set_cursors(struct navit *this_)
+{
+       struct attr name;
+       struct navit_vehicle *nv;
+       struct cursor *c;
+       GList *v;
+
+       v=g_list_first(this_->vehicles); // GList of navit_vehicles
+       while (v) {
+               nv=v->data;
+               if (vehicle_get_attr(nv->vehicle, attr_cursorname, &name, NULL))
+                       c=layout_get_cursor(this_->layout_current, name.u.str);
+               else
+                       c=layout_get_cursor(this_->layout_current, "default");
+               vehicle_set_cursor(nv->vehicle, c);
+               v=g_list_next(v);
+       }
+       return;
+}
+
+static int
+navit_get_cursor_pnt(struct navit *this_, struct point *p, int *dir)
 {
        int width, height;
-       struct point pn;
+       struct navit_vehicle *nv=this_->vehicle;
+
+        float offset=30;            // Cursor offset from the center of the screen (percent).
+#if 0 /* Better improve track.c to get that issue resolved or make it configurable with being off the default, the jumping back to the center is a bit annoying */
+        float min_offset = 0.;      // Percent offset at min_offset_speed.
+        float max_offset = 30.;     // Percent offset at max_offset_speed.
+        int min_offset_speed = 2;   // Speed in km/h
+        int max_offset_speed = 50;  // Speed ini km/h
+        // Calculate cursor offset from the center of the screen, upon speed.
+        if (nv->speed <= min_offset_speed) {
+            offset = min_offset;
+        } else if (nv->speed > max_offset_speed) {
+            offset = max_offset;
+        } else {
+            offset = (max_offset - min_offset) / (max_offset_speed - min_offset_speed) * (nv->speed - min_offset_speed);
+        }
+#endif
 
        transform_get_size(this_->trans, &width, &height);
+       if (this_->orientation == -1) {
+               p->x=50*width/100;
+               p->y=(50 + offset)*height/100;
+               if (dir)
+                       *dir=nv->dir;
+       } else {
+               int mdir;
+               if (this_->tracking && this_->tracking_flag) {
+                       mdir = tracking_get_angle(this_->tracking) - this_->orientation;
+               } else {
+                       mdir=nv->dir-this_->orientation;
+               }
+
+               p->x=(50 - offset*sin(M_PI*mdir/180.))*width/100;
+               p->y=(50 + offset*cos(M_PI*mdir/180.))*height/100;
+               if (dir)
+                       *dir=this_->orientation;
+       }
+       return 1;
+}
+
+static void
+navit_set_center_cursor(struct navit *this_)
+{
+       int dir;
+       struct point pn;
+       struct navit_vehicle *nv=this_->vehicle;
+       navit_get_cursor_pnt(this_, &pn, &dir);
        transform_set_yaw(this_->trans, dir);
-       pn.x=xpercent*width/100;
-       pn.y=ypercent*height/100;
-       navit_set_center_coord_screen(this_, cursor, &pn);
+       navit_set_center_coord_screen(this_, &nv->coord, &pn, 0);
+       navit_autozoom(this_, &nv->coord, nv->speed, 0);
        if (this_->ready == 3)
-               navit_draw(this_);
+               navit_draw_async(this_, 1);
 }
 
+static void
+navit_cmd_set_center_cursor(struct navit *this_)
+{
+       navit_set_center_cursor(this_);
+}
 
 void
-navit_set_center_screen(struct navit *this_, struct point *p)
+navit_set_center_screen(struct navit *this_, struct point *p, int set_timeout)
 {
        struct coord c;
        struct pcoord pc;
@@ -1342,45 +1618,113 @@ navit_set_center_screen(struct navit *this_, struct point *p)
        pc.x = c.x;
        pc.y = c.y;
        pc.pro = transform_get_projection(this_->trans);
-       navit_set_center(this_, &pc);
+       navit_set_center(this_, &pc, set_timeout);
 }
 
-int
-navit_set_attr(struct navit *this_, struct attr *attr)
+#if 0
+               switch((*attrs)->type) {
+               case attr_zoom:
+                       zoom=(*attrs)->u.num;
+                       break;
+               case attr_center:
+                       g=*((*attrs)->u.coord_geo);
+                       break;
+#endif
+
+static int
+navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
 {
        int dir=0, orient_old=0, attr_updated=0;
+       struct coord co;
+       long zoom;
+       GList *l;
+       struct navit_vehicle *nv;
+       struct attr active=(struct attr){attr_active,{(void *)0}};
+       struct layout *lay;
 
        switch (attr->type) {
-       case attr_cursor:
-               if (this_->cursor_flag != !!attr->u.num) {
-                       this_->cursor_flag=!!attr->u.num;
-                       attr_updated=1;
-               }
+       case attr_autozoom:
+               attr_updated=(this_->autozoom_secs != attr->u.num);
+               this_->autozoom_secs = attr->u.num;
+               break;
+       case attr_autozoom_active:
+               attr_updated=(this_->autozoom_active != attr->u.num);
+               this_->autozoom_active = attr->u.num;
+               break;
+       case attr_center:
+               transform_from_geo(transform_get_projection(this_->trans), attr->u.coord_geo, &co);
+               dbg(1,"0x%x,0x%x\n",co.x,co.y);
+               transform_set_center(this_->trans, &co);
+               break;
+       case attr_drag_bitmap:
+               attr_updated=(this_->drag_bitmap != !!attr->u.num);
+               this_->drag_bitmap=!!attr->u.num;
+               break;
+       case attr_flags_graphics:
+               attr_updated=(this_->graphics_flags != attr->u.num);
+               this_->graphics_flags=attr->u.num;
+               break;
+       case attr_follow:
+               if (!this_->vehicle)
+                       return 0;
+               attr_updated=(this_->vehicle->follow_curr != attr->u.num);
+               this_->vehicle->follow_curr = attr->u.num;
                break;
        case attr_layout:
                if(this_->layout_current!=attr->u.layout) {
                        this_->layout_current=attr->u.layout;
                        graphics_font_destroy_all(this_->gra);
-                       navit_draw(this_);
+                       navit_set_cursors(this_);
+                       if (this_->ready == 3)
+                               navit_draw(this_);
                        attr_updated=1;
                }
                break;
+       case attr_layout_name:
+               l=this_->layouts;
+               while (l) {
+                       lay=l->data;
+                       if (!strcmp(lay->name,attr->u.str)) {
+                               struct attr attr;
+                               attr.type=attr_layout;
+                               attr.u.layout=lay;
+                               return navit_set_attr_do(this_, &attr, init);
+                       }
+                       l=g_list_next(l);
+               }               
+               return 0;
        case attr_orientation:
                orient_old=this_->orientation;
                this_->orientation=attr->u.num;
-               if (this_->orientation != -1) {
-                       dir = this_->orientation;
-               } else {
-                       if (this_->vehicle) {
-                               dir = this_->vehicle->dir;
+               if (!init) {
+                       if (this_->orientation != -1) {
+                               dir = this_->orientation;
+                       } else {
+                               if (this_->vehicle) {
+                                       dir = this_->vehicle->dir;
+                               }
+                       }
+                       transform_set_yaw(this_->trans, dir);
+                       if (orient_old != this_->orientation) {
+#if 0
+                               if (this_->ready == 3)
+                                       navit_draw(this_);
+#endif
+                               attr_updated=1;
                        }
                }
-               transform_set_yaw(this_->trans, dir);
-               if (orient_old != this_->orientation) {
-                       if (this_->ready == 3)
-                               navit_draw(this_);
-                       attr_updated=1;
-               }
+               break;
+       case attr_osd_configuration:
+               dbg(0,"setting osd_configuration to %d (was %d)\n", attr->u.num, this_->osd_configuration);
+               attr_updated=(this_->osd_configuration != attr->u.num);
+               this_->osd_configuration=attr->u.num;
+               break;
+       case attr_pitch:
+               attr_updated=(this_->pitch != attr->u.num);
+               this_->pitch=attr->u.num;
+               transform_set_pitch(this_->trans, this_->pitch);
+               if (!init && attr_updated && this_->ready == 3)
+                       navit_draw(this_);
                break;
        case attr_projection:
                if(this_->trans && transform_get_projection(this_->trans) != attr->u.projection) {
@@ -1388,52 +1732,149 @@ navit_set_attr(struct navit *this_, struct attr *attr)
                        attr_updated=1;
                }
                break;
-       case attr_tracking:
-               if (this_->tracking_flag != !!attr->u.num) {
-                       this_->tracking_flag=!!attr->u.num;
+       case attr_recent_dest:
+               attr_updated=(this_->recentdest_count != attr->u.num);
+               this_->recentdest_count=attr->u.num;
+               break;
+       case attr_speech:
+               if(this_->speech && this_->speech != attr->u.speech) {
                        attr_updated=1;
-               }
+                       this_->speech = attr->u.speech;
+               }
+               break;
+       case attr_timeout:
+               attr_updated=(this_->center_timeout != attr->u.num);
+               this_->center_timeout = attr->u.num;
+               break;
+       case attr_tracking:
+               attr_updated=(this_->tracking_flag != !!attr->u.num);
+               this_->tracking_flag=!!attr->u.num;
+               break;
+       case attr_use_mousewheel:
+               attr_updated=(this_->use_mousewheel != !!attr->u.num);
+               this_->use_mousewheel=!!attr->u.num;
                break;
        case attr_vehicle:
-               if (!this_->vehicle || this_->vehicle->vehicle != attr->u.vehicle) {
-                       GList *l;
-                       l=this_->vehicles;
-                       while(l) {
-                               if (((struct navit_vehicle *)l->data)->vehicle == attr->u.vehicle) {
-                                       this_->vehicle=(struct navit_vehicle *)l->data;
+               l=this_->vehicles;
+               while(l) {
+                       nv=l->data;
+                       if (nv->vehicle == attr->u.vehicle) {
+                               if (!this_->vehicle || this_->vehicle->vehicle != attr->u.vehicle) {
+                                       if (this_->vehicle)
+                                               vehicle_set_attr(this_->vehicle->vehicle, &active);
+                                       active.u.num=1;
+                                       vehicle_set_attr(nv->vehicle, &active);
                                        attr_updated=1;
                                }
-                               l=g_list_next(l);
+                               navit_set_vehicle(this_, nv);
                        }
+                       l=g_list_next(l);
                }
                break;
+       case attr_zoom:
+               zoom=transform_get_scale(this_->trans);
+               attr_updated=(zoom != attr->u.num);
+               transform_set_scale(this_->trans, attr->u.num);
+               if (attr_updated && !init) 
+                       navit_draw(this_);
+               break;
+       case attr_zoom_min:
+               attr_updated=(attr->u.num != this_->zoom_min);
+               this_->zoom_min=attr->u.num;
+               break;
+       case attr_zoom_max:
+               attr_updated=(attr->u.num != this_->zoom_max);
+               this_->zoom_max=attr->u.num;
+               break;
+       case attr_message:
+               navit_add_message(this_, attr->u.str);
+               break;
+       case attr_follow_cursor:
+               attr_updated=(this_->follow_cursor != !!attr->u.num);
+               this_->follow_cursor=!!attr->u.num;
+               break;
        default:
                return 0;
        }
-       if (attr_updated) {
+       if (attr_updated && !init) {
                callback_list_call_attr_2(this_->attr_cbl, attr->type, this_, attr);
+               if (attr->type == attr_osd_configuration)
+                       graphics_draw_mode(this_->gra, draw_mode_end);
        }
        return 1;
 }
 
 int
+navit_set_attr(struct navit *this_, struct attr *attr)
+{
+       return navit_set_attr_do(this_, attr, 0);
+}
+
+int
 navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter)
 {
+       struct message *msg;
+       int len,offset;
+       int ret=1;
+
        switch (type) {
+       case attr_message:
+               msg = navit_get_messages(this_);
+               
+               if (!msg) {
+                       return 0;
+               }
+
+               len = 0;
+               while (msg) {
+                       len += strlen(msg->text) + 1;
+                       msg = msg->next;
+               }
+               attr->u.str = g_malloc(len + 1);
+               
+               msg = navit_get_messages(this_);
+               offset = 0;
+               while (msg) {
+                       g_stpcpy((attr->u.str + offset), msg->text);
+                       offset += strlen(msg->text);
+                       attr->u.str[offset] = '\n';
+                       offset++;
+
+                       msg = msg->next;
+               }
+
+               attr->u.str[len] = '\0';
+               break;
        case attr_bookmark_map:
                attr->u.map=this_->bookmark;
                break;
-       case attr_cursor:
-               attr->u.num=this_->cursor_flag;
+       case attr_callback_list:
+               attr->u.callback_list=this_->attr_cbl;
                break;
        case attr_destination:
                if (! this_->destination_valid)
                        return 0;
                attr->u.pcoord=&this_->destination;
                break;
+       case attr_displaylist:
+               attr->u.displaylist=this_->displaylist;
+               return (attr->u.displaylist != NULL);
+       case attr_follow:
+               if (!this_->vehicle)
+                       return 0;
+               attr->u.num=this_->vehicle->follow_curr;
+               break;
        case attr_former_destination_map:
                attr->u.map=this_->former_destination;
                break;
+       case attr_graphics:
+               attr->u.graphics=this_->gra;
+               ret=(attr->u.graphics != NULL);
+               break;
+       case attr_gui:
+               attr->u.gui=this_->gui;
+               ret=(attr->u.gui != NULL);
+               break;
        case attr_layout:
                if (iter) {
                        if (iter->u.list) {
@@ -1462,12 +1903,21 @@ navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, stru
                        return 0;
                }
                break;
+       case attr_mapset:
+               attr->u.mapset=this_->mapsets->data;
+               return (attr->u.mapset != NULL);
        case attr_navigation:
                attr->u.navigation=this_->navigation;
                break;
        case attr_orientation:
                attr->u.num=this_->orientation;
                break;
+       case attr_osd_configuration:
+               attr->u.num=this_->osd_configuration;
+               break;
+       case attr_pitch:
+               attr->u.num=transform_get_pitch(this_->trans);
+               break;
        case attr_projection:
                if(this_->trans) {
                        attr->u.num=transform_get_projection(this_->trans);
@@ -1478,9 +1928,15 @@ navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, stru
        case attr_route:
                attr->u.route=this_->route;
                break;
+       case attr_speech:
+               attr->u.speech=this_->speech;
+               break;
        case attr_tracking:
                attr->u.num=this_->tracking_flag;
                break;
+       case attr_transformation:
+               attr->u.transformation=this_->trans;
+               break;
        case attr_vehicle:
                if(iter) {
                        if(iter->u.list) {
@@ -1502,11 +1958,17 @@ navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, stru
        case attr_zoom:
                attr->u.num=transform_get_scale(this_->trans);
                break;
+       case attr_autozoom_active:
+               attr->u.num=this_->autozoom_active;
+               break;
+       case attr_follow_cursor:
+               attr->u.num=this_->follow_cursor;
+               break;
        default:
                return 0;
        }
        attr->type=type;
-       return 1;
+       return ret;
 }
 
 static int
@@ -1531,6 +1993,9 @@ navit_add_attr(struct navit *this_, struct attr *attr)
 {
        int ret=1;
        switch (attr->type) {
+       case attr_callback:
+               navit_add_callback(this_, attr->u.callback);
+               break;
        case attr_log:
                ret=navit_add_log(this_, attr->u.log);
                break;
@@ -1544,7 +2009,6 @@ navit_add_attr(struct navit *this_, struct attr *attr)
                this_->layouts = g_list_append(this_->layouts, attr->u.layout);
                if(!this_->layout_current) 
                        this_->layout_current=attr->u.layout;
-               ret=1;
                break;
        case attr_route:
                this_->route=attr->u.route;
@@ -1567,8 +2031,11 @@ navit_add_attr(struct navit *this_, struct attr *attr)
        case attr_vehicle:
                ret=navit_add_vehicle(this_, attr->u.vehicle);
                break;
-       case attr_timeout:
-               this_->center_timeout = attr->u.num;
+       case attr_vehicleprofile:
+               this_->vehicleprofiles=g_list_prepend(this_->vehicleprofiles, attr->u.vehicleprofile);
+               break;
+       case attr_autozoom_min:
+               this_->autozoom_min = attr->u.num;
                break;
        default:
                return 0;
@@ -1577,8 +2044,22 @@ navit_add_attr(struct navit *this_, struct attr *attr)
        return ret;
 }
 
+int
+navit_remove_attr(struct navit *this_, struct attr *attr)
+{
+       int ret=1;
+       switch (attr->type) {
+       case attr_callback:
+               navit_remove_callback(this_, attr->u.callback);
+               break;
+       default:
+               return 0;
+       }
+       return ret;
+}
+
 struct attr_iter *
-navit_attr_iter_new()
+navit_attr_iter_new(void)
 {
        return g_new0(struct attr_iter, 1);
 }
@@ -1613,27 +2094,22 @@ navit_vehicle_draw(struct navit *this_, struct navit_vehicle *nv, struct point *
 {
        struct point cursor_pnt;
        enum projection pro;
-       struct attr cursor;
 
        if (this_->blocked)
                return;
-       if (! vehicle_get_attr(nv->vehicle, attr_cursor, &cursor, NULL))
-               return;
-       if (! cursor.u.cursor)
-               return;
        if (pnt)
                cursor_pnt=*pnt;
        else {
                pro=transform_get_projection(this_->trans);
                transform(this_->trans, pro, &nv->coord, &cursor_pnt, 1, 0, 0, NULL);
        }
-       cursor_draw(cursor.u.cursor, this_->gra, &cursor_pnt, pnt ? 0:1, nv->dir-transform_get_yaw(this_->trans), nv->speed);
+       vehicle_draw(nv->vehicle, this_->gra, &cursor_pnt, pnt ? 0:1, nv->dir-transform_get_yaw(this_->trans), nv->speed);
 #if 0  
        if (pnt)
                pnt2=*pnt;
        else {
                pro=transform_get_projection(this_->trans);
-               transform(this_->trans, pro, &nv->coord, &pnt2, 1, 0);
+               transform(this_->trans, pro, &nv->coord, &pnt2, 1);
        }
 #if 1
        cursor_draw(nv->cursor, &pnt2, nv->dir-transform_get_angle(this_->trans, 0), nv->speed > 2, pnt == NULL);
@@ -1646,120 +2122,78 @@ navit_vehicle_draw(struct navit *this_, struct navit_vehicle *nv, struct point *
 static void
 navit_vehicle_update(struct navit *this_, struct navit_vehicle *nv)
 {
-       struct attr attr_dir, attr_speed, attr_pos;
+       struct attr attr_valid, attr_dir, attr_speed, attr_pos;
        struct pcoord cursor_pc;
        struct point cursor_pnt, *pnt=&cursor_pnt;
-       enum projection pro;
+       struct tracking *tracking=NULL;
+       enum projection pro=transform_get_projection(this_->trans);
        int border=16;
-       int route_path_set=0;
-       int recenter = 1; // indicates if we should recenter the map
+       int (*get_attr)(void *, enum attr_type, struct attr *, struct attr_iter *);
+       void *attr_object;
 
        profile(0,NULL);
        if (this_->ready != 3) {
                profile(0,"return 1\n");
                return;
        }
-
-       if (! vehicle_get_attr(nv->vehicle, attr_position_direction, &attr_dir, NULL) ||
-           ! vehicle_get_attr(nv->vehicle, attr_position_speed, &attr_speed, NULL) ||
-           ! vehicle_get_attr(nv->vehicle, attr_position_coord_geo, &attr_pos, NULL)) {
+       navit_layout_switch(this_);
+       if (this_->vehicle == nv && this_->tracking_flag)
+               tracking=this_->tracking;
+       if (tracking) {
+               tracking_update(tracking, nv->vehicle, this_->vehicleprofile, pro);
+               attr_object=tracking;
+               get_attr=(int (*)(void *, enum attr_type, struct attr *, struct attr_iter *))tracking_get_attr;
+       } else {
+               attr_object=nv->vehicle;
+               get_attr=(int (*)(void *, enum attr_type, struct attr *, struct attr_iter *))vehicle_get_attr;
+       }
+       if (get_attr(attr_object, attr_position_valid, &attr_valid, NULL))
+               if (!attr_valid.u.num != attr_position_valid_invalid)
+                       return;
+       if (! get_attr(attr_object, attr_position_direction, &attr_dir, NULL) ||
+           ! get_attr(attr_object, attr_position_speed, &attr_speed, NULL) ||
+           ! get_attr(attr_object, attr_position_coord_geo, &attr_pos, NULL)) {
                profile(0,"return 2\n");
                return;
        }
        nv->dir=*attr_dir.u.numd;
        nv->speed=*attr_speed.u.numd;
-       pro=transform_get_projection(this_->trans);
        transform_from_geo(pro, attr_pos.u.coord_geo, &nv->coord);
        if (nv != this_->vehicle) {
                navit_vehicle_draw(this_, nv, NULL);
                profile(0,"return 3\n");
                return;
        }
-
-       if (nv->speed < 10) {
-               long long diff,diff_x,diff_y;
-
-               diff_x = abs(nv->coord.x - nv->last.x);
-               diff_y = abs(nv->coord.y - nv->last.y);
-               diff = (diff_x * diff_x) + (diff_y * diff_y);
-
-               if ((diff < 20) && (diff > 0)) { // if our long is only 32 bit wide, we could run into an overflow here
-                       recenter = 0;
-               }
-       }
-       if (recenter) {
-               nv->last = nv->coord;
-       }
-
-       if (this_->route)
-               route_path_set=route_get_path_set(this_->route);
        cursor_pc.x = nv->coord.x;
        cursor_pc.y = nv->coord.y;
        cursor_pc.pro = pro;
-       if (this_->tracking && this_->tracking_flag) {
-               if (tracking_update(this_->tracking, &cursor_pc, nv->dir)) {
-                       nv->coord.x=cursor_pc.x;
-                       nv->coord.y=cursor_pc.y;
-               }
-       }
-       if (nv->update_curr == 1) {
-               if (this_->route) {
-                       if (this_->tracking && this_->tracking_flag)
-                               route_set_position_from_tracking(this_->route, this_->tracking);
-                       else
-                               route_set_position(this_->route, &cursor_pc);
-               }
-               callback_list_call_attr_0(this_->attr_cbl, attr_position);
+       if (this_->route) {
+               if (tracking)
+                       route_set_position_from_tracking(this_->route, tracking, pro);
+               else
+                       route_set_position(this_->route, &cursor_pc);
        }
+       callback_list_call_attr_0(this_->attr_cbl, attr_position);
        navit_textfile_debug_log(this_, "type=trackpoint_tracked");
+       if (this_->gui && nv->speed > 2)
+               gui_disable_suspend(this_->gui);
+
        transform(this_->trans, pro, &nv->coord, &cursor_pnt, 1, 0, 0, NULL);
-       if (!transform_within_border(this_->trans, &cursor_pnt, border)) {
-               if (!this_->cursor_flag) {
-                       profile(0,"return 4\n");
-                       return;
-               }
-               if ((nv->follow_curr != 1) && ((time(NULL) - this_->last_moved) > this_->center_timeout) && (this_->button_pressed != 1) && (recenter)) {
-                       if (this_->orientation != -1) {
-                               int dir=nv->dir-this_->orientation;
-                               navit_set_center_cursor(this_, &nv->coord, 0, 50 - 30.*sin(M_PI*dir/180.), 50 + 30.*cos(M_PI*dir/180.));
-                       }
-                       else
-                               navit_set_center_cursor(this_, &nv->coord, nv->dir, 50, 80);
-                       pnt=NULL;
-               }
-       }
+       if (this_->button_pressed != 1 && this_->follow_cursor && nv->follow_curr <= nv->follow && 
+               (nv->follow_curr == 1 || !transform_within_border(this_->trans, &cursor_pnt, border)))
+               navit_set_center_cursor(this_);
+       else
+               navit_vehicle_draw(this_, nv, pnt);
 
-#ifndef _WIN32
-       if (this_->pid && nv->speed > 2)
-               kill(this_->pid, SIGWINCH);
-#endif
-       if (this_->route && nv->update_curr == 1)
-               navigation_update(this_->navigation, this_->route);
-       if ((nv->follow_curr == 1) && (!this_->button_pressed)) {
-               if (this_->cursor_flag && ((time(NULL) - this_->last_moved) > this_->center_timeout) && (recenter)) {
-                       navit_set_center_cursor(this_, &nv->coord, nv->dir, 50, 80);
-                       pnt=NULL;
-               } else { // We don't want to center, but redraw because otherwise the old route "lags"
-                       navit_draw(this_);
-               }
-       }
-       if (pnt && this_->route && !route_path_set && route_get_path_set(this_->route))
-               navit_draw(this_);
        if (nv->follow_curr > 1)
                nv->follow_curr--;
        else
                nv->follow_curr=nv->follow;
-       if (nv->update_curr > 1)
-               nv->update_curr--;
-       else
-               nv->update_curr=nv->update;
        callback_list_call_attr_2(this_->attr_cbl, attr_position_coord_geo, this_, nv->vehicle);
-       if (pnt)
-               navit_vehicle_draw(this_, nv, pnt);
 
        /* Finally, if we reached our destination, stop navigation. */
        if (this_->route && route_destination_reached(this_->route)) {
-               navit_set_destination(this_, NULL, NULL);
+               navit_set_destination(this_, NULL, NULL, 0);
        }
        profile(0,"return 5\n");
 }
@@ -1778,22 +2212,41 @@ navit_set_position(struct navit *this_, struct pcoord *c)
        if (this_->route) {
                route_set_position(this_->route, c);
                callback_list_call_attr_0(this_->attr_cbl, attr_position);
-               if (this_->navigation) {
-                       navigation_update(this_->navigation, this_->route);
-#if 0
-                       map_dump_file(route_get_map(this_->route), "route.txt");
-                       map_dump_file(navigation_get_map(this_->navigation), "navigation.txt");
-#endif
-               }
        }
        if (this_->ready == 3)
                navit_draw(this_);
 }
 
+static int
+navit_set_vehicleprofile(struct navit *this_, char *name)
+{
+       struct attr attr;
+       GList *l;
+       l=this_->vehicleprofiles;
+       while (l) {
+               if (vehicleprofile_get_attr(l->data, attr_name, &attr, NULL)) {
+                       if (!strcmp(attr.u.str, name)) {
+                               this_->vehicleprofile=l->data;
+                               if (this_->route)
+                                       route_set_profile(this_->route, this_->vehicleprofile);
+                               return 1;
+                       }
+               }
+               l=g_list_next(l);
+       }
+       return 0;
+}
+
 static void
 navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv)
 {
+       struct attr attr;
        this_->vehicle=nv;
+       if (nv && vehicle_get_attr(nv->vehicle, attr_profilename, &attr, NULL)) {
+               if (navit_set_vehicleprofile(this_, attr.u.str))
+                       return;
+       }
+       navit_set_vehicleprofile(this_,"car");
 }
 
 /**
@@ -1807,24 +2260,14 @@ static int
 navit_add_vehicle(struct navit *this_, struct vehicle *v)
 {
        struct navit_vehicle *nv=g_new0(struct navit_vehicle, 1);
-       struct attr update,follow,color,active, color2, animate;
+       struct attr follow, active, animate;
        nv->vehicle=v;
-       nv->update=1;
        nv->follow=0;
        nv->last.x = 0;
        nv->last.y = 0;
        nv->animate_cursor=0;
-       if ((vehicle_get_attr(v, attr_update, &update, NULL)))
-               nv->update=nv->update=update.u.num;
        if ((vehicle_get_attr(v, attr_follow, &follow, NULL)))
                nv->follow=nv->follow=follow.u.num;
-       if ((vehicle_get_attr(v, attr_color, &color, NULL)))
-               nv->c=*(color.u.color);
-       if ((vehicle_get_attr(v, attr_color2, &color2, NULL)))
-               nv->c2=color2.u.color;
-       else
-               nv->c2=NULL;
-       nv->update_curr=nv->update;
        nv->follow_curr=nv->follow;
        this_->vehicles=g_list_append(this_->vehicles, nv);
        if ((vehicle_get_attr(v, attr_active, &active, NULL)) && active.u.num)
@@ -1832,9 +2275,9 @@ navit_add_vehicle(struct navit *this_, struct vehicle *v)
        if ((vehicle_get_attr(v, attr_animate, &animate, NULL)))
                nv->animate_cursor=animate.u.num;
        nv->callback.type=attr_callback;
-       nv->callback.u.callback=callback_new_2(callback_cast(navit_vehicle_update), this_, nv);
+       nv->callback.u.callback=callback_new_attr_2(callback_cast(navit_vehicle_update), attr_position_coord_geo, this_, nv);
        vehicle_add_attr(nv->vehicle, &nv->callback);
-       vehicle_set_attr(nv->vehicle, &this_->self, NULL);
+       vehicle_set_attr(nv->vehicle, &this_->self);
        return 1;
 }
 
@@ -1871,50 +2314,133 @@ navit_get_displaylist(struct navit *this_)
        return this_->displaylist;
 }
 
-int
-navit_block(struct navit *this_, int block)
-{
-       if (block) {
-               this_->blocked |= 1;
-               return 0;
+void
+navit_layout_switch(struct navit *n) 
+{
+
+    int currTs=0;
+    struct attr iso8601_attr,geo_attr,valid_attr,layout_attr;
+    double trise,tset,trise_actual;
+    struct layout *l;
+    int year, month, day;
+    
+    if (navit_get_attr(n,attr_layout,&layout_attr,NULL)!=1) {
+       return; //No layout - nothing to switch
+    }
+    if (!n->vehicle)
+       return;
+    l=layout_attr.u.layout;
+    
+    if (l->dayname || l->nightname) {
+       //Ok, we know that we have profile to switch
+       
+       //Check that we aren't calculating too fast
+       if (vehicle_get_attr(n->vehicle->vehicle, attr_position_time_iso8601,&iso8601_attr,NULL)==1) {
+               currTs=iso8601_to_secs(iso8601_attr.u.str);
        }
-       if (this_->blocked & 2) {
-               this_->blocked=0;
-               navit_draw(this_);
-               return 1;
+       if (currTs-(n->prevTs)<60) {
+           //We've have to wait a little
+           return;
        }
-       this_->blocked=0;
-       return 0;
+       if (sscanf(iso8601_attr.u.str,"%d-%02d-%02dT",&year,&month,&day) != 3)
+               return;
+       if (vehicle_get_attr(n->vehicle->vehicle, attr_position_coord_geo,&geo_attr,NULL)!=1) {
+               //No position - no sun
+               return;
+       }
+       if (vehicle_get_attr(n->vehicle->vehicle, attr_position_valid, &valid_attr,NULL) && valid_attr.u.num==attr_position_valid_invalid) {
+               return; //No valid fix yet
+       }
+       
+       //We calculate sunrise anyway, cause it is need both for day and for night
+        if (__sunriset__(year,month,day,geo_attr.u.coord_geo->lat,geo_attr.u.coord_geo->lng,35,1,&trise,&tset)!=0) {
+               //near the pole sun never rises/sets, so we should never switch profiles
+               n->prevTs=currTs;
+               return;
+           }
+       
+        trise_actual=trise;
+       
+       if (l->dayname) {
+       
+           if ((HOURS(trise)*60+MINUTES(trise)==(currTs%86400)/60) || 
+                   (n->prevTs==0 && ((HOURS(trise)*60+MINUTES(trise)<(currTs%86400)/60)))) {
+               //The sun is rising now!
+               if (strcmp(l->name,l->dayname)) {
+                   navit_set_layout_by_name(n,l->dayname);
+               }
+           }
+       }
+       if (l->nightname) {
+           if (__sunriset__(year,month,day,geo_attr.u.coord_geo->lat,geo_attr.u.coord_geo->lng,-12,0,&trise,&tset)!=0) {
+               //near the pole sun never rises/sets, so we should never switch profiles
+               n->prevTs=currTs;
+               return;
+           }
+           
+           if (HOURS(tset)*60+MINUTES(tset)==((currTs%86400)/60)
+               || (n->prevTs==0 && (((HOURS(tset)*60+MINUTES(tset)<(currTs%86400)/60)) || 
+                       ((HOURS(trise_actual)*60+MINUTES(trise_actual)>(currTs%86400)/60))))) {
+               //Time to sleep
+               if (strcmp(l->name,l->nightname)) {
+                   navit_set_layout_by_name(n,l->nightname);
+               }
+           }   
+       }
+       
+       n->prevTs=currTs;
+    }
 }
 
-int
-navit_command_register(struct navit *this_, char *command, struct callback *cb)
+int 
+navit_set_layout_by_name(struct navit *n,char *name) 
 {
-       dbg(1,"registering '%s'\n", command);
-       g_hash_table_insert(this_->commands, command, cb);
+    struct layout *l;
+    struct attr_iter iter;
+    struct attr layout_attr;
 
-       return 0;
-}
+    iter.u.list=0x00;
 
-struct callback *
-navit_command_unregister(struct navit *this_, char *command)
-{
-       struct callback *ret=g_hash_table_lookup(this_->commands, command);
-       if (ret) {
-               g_hash_table_remove(this_->commands, command);
+    if (navit_get_attr(n,attr_layout,&layout_attr,&iter)!=1) {
+       return 0; //No layouts - nothing to do
+    }
+    if (iter.u.list==NULL) {
+       return 0;
+    }
+    
+    iter.u.list=g_list_first(iter.u.list);
+    
+    while(iter.u.list) {
+       l=(struct layout*)iter.u.list->data;
+       if (!strcmp(name,l->name)) {
+           layout_attr.u.layout=l;
+           layout_attr.type=attr_layout;
+           navit_set_attr(n,&layout_attr);
+           iter.u.list=g_list_first(iter.u.list);
+           return 1;
        }
+       iter.u.list=g_list_next(iter.u.list);
+    }
 
-       return ret;
+    iter.u.list=g_list_first(iter.u.list);
+    return 0;
 }
 
 int
-navit_command_call(struct navit *this_, char *command)
+navit_block(struct navit *this_, int block)
 {
-       struct callback *cb=g_hash_table_lookup(this_->commands, command);
-       dbg(0,"calling callback %p for '%s'\n", cb, command);
-       if (! cb)
+       if (block) {
+               this_->blocked |= 1;
+               if (graphics_draw_cancel(this_->gra, this_->displaylist))
+                       this_->blocked |= 2;
+               return 0;
+       }
+       if (this_->blocked & 2) {
+               this_->blocked=0;
+               navit_draw(this_);
                return 1;
-       callback_call_1(cb, command);
+       }
+       this_->blocked=0;
        return 0;
 }
 
@@ -1924,23 +2450,22 @@ navit_destroy(struct navit *this_)
        /* TODO: destroy objects contained in this_ */
        if (this_->vehicle)
                vehicle_destroy(this_->vehicle->vehicle);
-       main_remove_navit(this_);
        char *center_file = navit_get_center_file(TRUE);
        navit_write_center_to_file(this_, center_file);
        g_free(center_file);
-       callback_destroy(navit_command_unregister(this_, "zoom_in"));
-       callback_destroy(navit_command_unregister(this_, "zoom_out"));
        callback_destroy(this_->nav_speech_cb);
        callback_destroy(this_->roadbook_callback);
        callback_destroy(this_->popup_callback);
        callback_destroy(this_->motion_timeout_callback);
-       graphics_remove_callback(this_->gra, this_->resize_callback);
+       if(this_->gra)
+         graphics_remove_callback(this_->gra, this_->resize_callback);
        callback_destroy(this_->resize_callback);
-       graphics_remove_callback(this_->gra, this_->button_callback);
+       if(this_->gra)
+         graphics_remove_callback(this_->gra, this_->button_callback);
        callback_destroy(this_->button_callback);
-       graphics_remove_callback(this_->gra, this_->motion_callback);
+       if(this_->gra)
+         graphics_remove_callback(this_->gra, this_->motion_callback);
        callback_destroy(this_->motion_callback);
-       g_hash_table_destroy(this_->commands);
        g_free(this_);
 }