Fix:gui_internal:Switch to numeric keyboard for house numbers
[navit-package] / navit / gui / internal / gui_internal.c
index 19b16cf..cb1733a 100644 (file)
 #include <stdlib.h>
 #include <math.h>
 #include <glib.h>
+#include <time.h>
+#ifdef HAVE_API_WIN32_BASE
+#include <windows.h>
+#endif
 #include "config.h"
 #include "item.h"
 #include "file.h"
 #include "navit.h"
+#include "navit_nls.h"
 #include "debug.h"
 #include "gui.h"
 #include "coord.h"
@@ -48,8 +53,9 @@
 #include "layout.h"
 #include "callback.h"
 #include "vehicle.h"
+#include "vehicleprofile.h"
 #include "window.h"
-#include "main.h"
+#include "config_.h"
 #include "keys.h"
 #include "mapset.h"
 #include "route.h"
 #include "config.h"
 #include "event.h"
 #include "navit_nls.h"
-
-#define STATE_VISIBLE 1
-#define STATE_SELECTED 2
-#define STATE_HIGHLIGHTED 4
-#define STATE_SENSITIVE 8
-#define STATE_EDIT 16
-#define STATE_CLEAR 32
-
-enum widget_type {
-       widget_box=1,
-       widget_button,
-       widget_label,
-       widget_image,
-       widget_table,
-       widget_table_row
-};
-
-enum flags {
-       gravity_none=0x00,
-       gravity_left=1,
-       gravity_xcenter=2,
-       gravity_right=4,
-       gravity_top=8,
-       gravity_ycenter=16,
-       gravity_bottom=32,
-       gravity_left_top=gravity_left|gravity_top,
-       gravity_top_center=gravity_xcenter|gravity_top,
-       gravity_right_top=gravity_right|gravity_top,
-       gravity_left_center=gravity_left|gravity_ycenter,
-       gravity_center=gravity_xcenter|gravity_ycenter,
-       gravity_right_center=gravity_right|gravity_ycenter,
-       gravity_left_bottom=gravity_left|gravity_bottom,
-       gravity_bottom_center=gravity_xcenter|gravity_bottom,
-       gravity_right_bottom=gravity_right|gravity_bottom,
-       flags_expand=0x100,
-       flags_fill=0x200,
-       orientation_horizontal=0x10000,
-       orientation_vertical=0x20000,
-       orientation_horizontal_vertical=0x40000,
-};
-
+#include "navigation.h"
+#include "gui_internal.h"
+#include "command.h"
+#include "xmlconfig.h"
+#include "util.h"
 
 struct menu_data {
        struct widget *search_list;
        struct widget *keyboard;
+       struct widget *button_bar;
        int keyboard_mode;
+       void (*redisplay)(struct gui_priv *priv, struct widget *widget, void *data);
+       struct widget *redisplay_widget;
 };
 
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 struct widget {
        enum widget_type type;
-       struct graphics_gc *background;
+       struct graphics_gc *background,*text_background;
        struct graphics_gc *foreground_frame;
+       struct graphics_gc *foreground;
        char *text;
        struct graphics_image *img;
         /**
@@ -123,21 +97,40 @@ struct widget {
          * @li widget The widget that is receiving the button press.
          *
          */
-       void (*func)(struct gui_priv *priv, struct widget *widget);
+       void (*func)(struct gui_priv *priv, struct widget *widget, void *data);
        int reason;
        int datai;
        void *data;
+       /**
+        * @brief A function to deallocate data
+        */
        void (*data_free)(void *data);
+
+       /**
+        * @brief a function that will be called as the widget is being destroyed.
+        * This function can act as a destructor for the widget. It allows for
+        * on deallocation actions to be specified on a per widget basis.
+        * This function will call g_free on the widget (if required).
+        */
+       void (*free) (struct gui_priv *this_, struct widget * w);
        char *prefix;
        char *name;
        char *speech;
+       char *command;
        struct pcoord c;
        struct item item;
+       int selection_id;
        int state;
        struct point p;
        int wmin,hmin;
        int w,h;
+       int textw,texth;
        int bl,br,bt,bb,spx,spy;
+       int border;
+       /**
+        * The number of widgets to layout horizontally when doing
+        * a orientation_horizontal_vertical layout
+        */
        int cols;
        enum flags flags;
        void *instance;
@@ -151,17 +144,17 @@ struct widget {
        int is_on;
        int redraw;
        struct menu_data *menu_data;
-       GList *children;  
+       GList *children;
 };
 
 /**
  * @brief A structure to store configuration values.
  *
  * This structure stores configuration values for how gui elements in the internal GUI
- * should be drawn.  
+ * should be drawn.
  */
 struct gui_config_settings {
-  
+
   /**
    * The base size (in fractions of a point) to use for text.
    */
@@ -182,7 +175,7 @@ struct gui_config_settings {
    * The default amount of spacing (in pixels) to place between GUI elements.
    */
   int spacing;
-  
+
 };
 
 /**
@@ -194,24 +187,31 @@ const int SMALL_PROFILE=2;
 
 /**
  * The default config profiles.
- * 
+ *
  * [0] =>  LARGE_PROFILE (screens 640 in one dimension)
  * [1] =>  MEDIUM PROFILE (screens larger than 320 in one dimension
  * [2] => Small profile (default)
  */
 static struct gui_config_settings config_profiles[]={
-  {545,32,40,44,2}
-    , {545,32,48,96,5}
+      {545,32,48,96,10}
+    , {300,32,48,64,3}
       ,{200,16,32,48,2}
 };
 
+struct route_data {
+  struct widget * route_table;
+  int route_showing;
+
+};
+
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 struct gui_priv {
        struct navit *nav;
+       struct attr self;
        struct window *win;
        struct graphics *gra;
        struct graphics_gc *background;
@@ -220,6 +220,7 @@ struct gui_priv {
        struct graphics_gc *foreground;
        struct graphics_gc *text_foreground;
        struct graphics_gc *text_background;
+       struct color background_color, background2_color, text_foreground_color, text_background_color;
        int spacing;
        int font_size;
        int fullscreen;
@@ -234,9 +235,11 @@ struct gui_priv {
        struct widget *highlighted_menu;
        int clickp_valid, vehicle_valid;
        struct pcoord clickp, vehiclep;
+       struct attr *click_coord_geo, *position_coord_geo;
        struct search_list *sl;
        int ignore_button;
        int menu_on_map_click;
+       int signal_on_map_click;
        char *country_iso2;
        int speech;
        int keyboard;
@@ -246,9 +249,56 @@ struct gui_priv {
         */
         struct gui_config_settings config;
        struct event_idle *idle;
-       struct callback *motion_cb,*button_cb,*resize_cb,*keypress_cb,*idle_cb, *motion_timeout_callback;
+       struct callback *motion_cb,*button_cb,*resize_cb,*keypress_cb,*window_closed_cb,*idle_cb, *motion_timeout_callback;
        struct event_timeout *motion_timeout_event;
        struct point current;
+
+       struct callback * vehicle_cb;
+         /**
+          * Stores information about the route.
+          */
+       struct route_data route_data;
+
+       struct gui_internal_data data;
+       struct callback_list *cbl;
+       int flags;
+       int cols;
+       struct attr osd_configuration;
+       int pitch;
+       int flags_town,flags_street,flags_house_number;
+/* html */
+       char *html_text;
+       int html_depth; 
+       struct widget *html_container;
+       int html_skip;
+       char *html_anchor;
+       int html_anchor_found;
+       struct html {
+               int skip;
+               enum html_tag {
+                       html_tag_none,
+                       html_tag_a,
+                       html_tag_h1,
+                       html_tag_html,
+                       html_tag_img,
+                       html_tag_script,
+               } tag;
+               char *command;
+               char *name;
+               char *href;
+               struct widget *w;
+       } html[10];
+};
+
+struct html_tag_map {
+       char *tag_name;
+       enum html_tag tag;
+} html_tag_map[] = {
+       {"a",html_tag_a},
+       {"h1",html_tag_h1},
+       {"html",html_tag_html},
+       {"img",html_tag_img},
+       {"script",html_tag_script},
 };
 
 
@@ -259,7 +309,7 @@ struct gui_priv {
  * table widget.
  *
  * The table_data structure needs to be freed with data_free along with the widget.
- * 
+ *
  */
 struct table_data
 {
@@ -295,7 +345,7 @@ struct table_data
    * A button widget to handle 'previous page' requests.
    */
   struct widget * prev_button;
-    
+
 
   /**
    * a pointer to the gui context.
@@ -323,6 +373,7 @@ struct table_column_desc
   int width;
 };
 
+
 static void gui_internal_widget_render(struct gui_priv *this, struct widget *w);
 static void gui_internal_widget_pack(struct gui_priv *this, struct widget *w);
 static struct widget * gui_internal_box_new(struct gui_priv *this, enum flags flags);
@@ -330,107 +381,132 @@ static void gui_internal_widget_append(struct widget *parent, struct widget *chi
 static void gui_internal_widget_destroy(struct gui_priv *this, struct widget *w);
 static void gui_internal_apply_config(struct gui_priv *this);
 
-static struct widget* gui_internal_widget_table_new(struct gui_priv * this, enum flags flags);
-static void gui_internal_widget_table_add_row(struct widget * table,  struct widget * row);
+static struct widget* gui_internal_widget_table_new(struct gui_priv * this, enum flags flags, int buttons);
+static struct widget * gui_internal_widget_table_row_new(struct gui_priv * this, enum flags flags);
 static void gui_internal_table_render(struct gui_priv * this, struct widget * w);
-static void gui_internal_cmd_route(struct gui_priv * this, struct widget * w);
 static void gui_internal_table_pack(struct gui_priv * this, struct widget * w);
-static void gui_internal_table_button_next(struct gui_priv * this, struct widget * wm);
-static void gui_internal_table_button_prev(struct gui_priv * this, struct widget * wm);
+static void gui_internal_table_button_next(struct gui_priv * this, struct widget * wm, void *data);
+static void gui_internal_table_button_prev(struct gui_priv * this, struct widget * wm, void *data);
+static void gui_internal_widget_table_clear(struct gui_priv * this,struct widget * table);
+static struct widget * gui_internal_widget_table_row_new(struct gui_priv * this, enum flags flags);
 static void gui_internal_table_data_free(void * d);
-
+static void gui_internal_route_update(struct gui_priv * this, struct navit * navit,
+                                     struct vehicle * v);
+static void gui_internal_route_screen_free(struct gui_priv * this_,struct widget * w);
+static void gui_internal_populate_route_table(struct gui_priv * this,
+                                      struct navit * navit);
 static void gui_internal_search_idle_end(struct gui_priv *this);
 static void gui_internal_search(struct gui_priv *this, char *what, char *type, int flags);
-static void gui_internal_search_street(struct gui_priv *this, struct widget *widget);
-static void gui_internal_search_street_in_town(struct gui_priv *this, struct widget *widget);
-static void gui_internal_search_town(struct gui_priv *this, struct widget *wm);
+static void gui_internal_search_house_number(struct gui_priv *this, struct widget *widget, void *data);
+static void gui_internal_search_house_number_in_street(struct gui_priv *this, struct widget *widget, void *data);
+static void gui_internal_search_street(struct gui_priv *this, struct widget *widget, void *data);
+static void gui_internal_search_street_in_town(struct gui_priv *this, struct widget *widget, void *data);
+static void gui_internal_search_town(struct gui_priv *this, struct widget *wm, void *data);
 static void gui_internal_search_town_in_country(struct gui_priv *this, struct widget *wm);
-static void gui_internal_search_country(struct gui_priv *this, struct widget *widget);
+static void gui_internal_search_country(struct gui_priv *this, struct widget *widget, void *data);
+static void gui_internal_check_exit(struct gui_priv *this);
+static void gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void *data);
 
 static struct widget *gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode);
-
+static struct menu_data * gui_internal_menu_data(struct gui_priv *this);
+
+static int gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle *vehicle);
+static void gui_internal_html_menu(struct gui_priv *this, const char *document, char *anchor);
+
+/*
+ * * Display image scaled to specific size
+ * * searches for scaleable and pre-scaled image
+ * * @param this Our gui context
+ * * @param name image name
+ * * @param w desired width of image
+ * * @param h desired height of image
+ * * @returns image_struct Ptr to scaled image struct or NULL if not scaled or found
+ * */
 static struct graphics_image *
-image_new_scaled(struct gui_priv *this, char *name, int w, int h)
+image_new_scaled(struct gui_priv *this, const char *name, int w, int h)
 {
        struct graphics_image *ret=NULL;
        char *full_name=NULL;
+       char *full_path=NULL;
        int i;
 
        for (i = 1 ; i < 6 ; i++) {
                full_name=NULL;
                switch (i) {
-               case 1:
-                       full_name=g_strdup_printf("%s/xpm/%s.svg", getenv("NAVIT_SHAREDIR"), name);
+               case 3:
+                       full_name=g_strdup_printf("%s.svg", name);
                        break;
                case 2:
-                       full_name=g_strdup_printf("%s/xpm/%s.svgz", getenv("NAVIT_SHAREDIR"), name);
+                       full_name=g_strdup_printf("%s.svgz", name);
                        break;
-               case 3:
+               case 1:
                        if (w != -1 && h != -1) {
-                               full_name=g_strdup_printf("%s/xpm/%s_%d_%d.png", getenv("NAVIT_SHAREDIR"), name, w, h);
+                               full_name=g_strdup_printf("%s_%d_%d.png", name, w, h);
                        }
                        break;
                case 4:
-                       full_name=g_strdup_printf("%s/xpm/%s.png", getenv("NAVIT_SHAREDIR"), name);
+                       full_name=g_strdup_printf("%s.png", name);
                        break;
                case 5:
-                       full_name=g_strdup_printf("%s/xpm/%s.xpm", getenv("NAVIT_SHAREDIR"), name);
+                       full_name=g_strdup_printf("%s.xpm", name);
                        break;
                }
                dbg(1,"trying '%s'\n", full_name);
                if (! full_name)
                        continue;
+#if 0
+               /* needs to be checked in the driver */
                if (!file_exists(full_name)) {
                        g_free(full_name);
                        continue;
                }
-               ret=graphics_image_new_scaled(this->gra, full_name, w, h);
+#endif
+               full_path=graphics_icon_path(full_name);
+               ret=graphics_image_new_scaled(this->gra, full_path, w, h);
                dbg(1,"ret=%p\n", ret);
+               g_free(full_path);
                g_free(full_name);
-               if (ret) 
-                       return ret;     
+               if (ret)
+                       return ret;
        }
        dbg(0,"failed to load %s with %d,%d\n", name, w, h);
        return NULL;
 }
 
-
+#if 0
 static struct graphics_image *
 image_new_o(struct gui_priv *this, char *name)
 {
        return image_new_scaled(this, name, -1, -1);
 }
+#endif
 
 static struct graphics_image *
-image_new_xs(struct gui_priv *this, char *name)
+image_new_xs(struct gui_priv *this, const char *name)
 {
        return image_new_scaled(this, name, this->icon_xs, this->icon_xs);
 }
 
 
 static struct graphics_image *
-image_new_s(struct gui_priv *this, char *name)
+image_new_s(struct gui_priv *this, const char *name)
 {
        return image_new_scaled(this, name, this->icon_s, this->icon_s);
 }
 
 static struct graphics_image *
-image_new_l(struct gui_priv *this, char *name)
+image_new_l(struct gui_priv *this, const char *name)
 {
        return image_new_scaled(this, name, this->icon_l, this->icon_l);
 }
 
 static char *
-coordinates(struct pcoord *pc, char sep)
+coordinates_geo(const struct coord_geo *gc, char sep)
 {
        char latc='N',lngc='E';
        int lat_deg,lat_min,lat_sec;
        int lng_deg,lng_min,lng_sec;
-       struct coord_geo g;
-       struct coord c;
-       c.x=pc->x;
-       c.y=pc->y;
-       transform_to_geo(pc->pro, &c, &g);
+       struct coord_geo g=*gc;
 
        if (g.lat < 0) {
                g.lat=-g.lat;
@@ -449,11 +525,23 @@ coordinates(struct pcoord *pc, char sep)
        return g_strdup_printf("%d°%d'%d\" %c%c%d°%d'%d\" %c",lat_deg,lat_min,lat_sec,latc,sep,lng_deg,lng_min,lng_sec,lngc);
 }
 
+static char *
+coordinates(struct pcoord *pc, char sep)
+{
+       struct coord_geo g;
+       struct coord c;
+       c.x=pc->x;
+       c.y=pc->y;
+       transform_to_geo(pc->pro, &c, &g);
+       return coordinates_geo(&g, sep);
+
+}
+
 static void
 gui_internal_background_render(struct gui_priv *this, struct widget *w)
 {
        struct point pnt=w->p;
-       if (w->state & STATE_HIGHLIGHTED) 
+       if (w->state & STATE_HIGHLIGHTED)
                graphics_draw_rectangle(this->gra, this->highlight_background, &pnt, w->w, w->h);
        else {
                if (w->background)
@@ -466,7 +554,7 @@ gui_internal_label_new(struct gui_priv *this, char *text)
        struct point p[4];
        int w=0;
        int h=0;
-       
+
        struct widget *widget=g_new0(struct widget, 1);
        widget->type=widget_label;
        if (text) {
@@ -476,8 +564,12 @@ gui_internal_label_new(struct gui_priv *this, char *text)
                h=p[0].y-p[2].y;
        }
        widget->h=h+this->spacing;
+       widget->texth=h;
        widget->w=w+this->spacing;
+       widget->textw=w;
        widget->flags=gravity_center;
+       widget->foreground=this->text_foreground;
+       widget->text_background=this->text_background;
 
        return widget;
 }
@@ -537,27 +629,39 @@ gui_internal_label_render(struct gui_priv *this, struct widget *w)
        struct point pnt=w->p;
        gui_internal_background_render(this, w);
        if (w->text) {
-               pnt.y+=w->h-this->spacing;
-               graphics_draw_text(this->gra, this->text_foreground, this->text_background, this->font, w->text, &pnt, 0x10000, 0x0);
+               if (w->flags & gravity_right) {
+                       pnt.y+=w->h-this->spacing;
+                       pnt.x+=w->w-w->textw-this->spacing;
+                       graphics_draw_text(this->gra, w->foreground, w->text_background, this->font, w->text, &pnt, 0x10000, 0x0);
+               } else {
+                       pnt.y+=w->h-this->spacing;
+                       graphics_draw_text(this->gra, w->foreground, w->text_background, this->font, w->text, &pnt, 0x10000, 0x0);
+               }
        }
 }
 
+/**
+ * @brief A text box is a widget that renders a text string containing newlines.
+ * The string will be broken up into label widgets at each newline with a vertical layout.
+ *
+ */
 static struct widget *
-gui_internal_text_new(struct gui_priv *this, char *text)
+gui_internal_text_new(struct gui_priv *this, char *text, enum flags flags)
 {
        char *s=g_strdup(text),*s2,*tok;
-       struct widget *ret=gui_internal_box_new(this, gravity_center|orientation_vertical);
+       struct widget *ret=gui_internal_box_new(this, flags);
        s2=s;
        while ((tok=strtok(s2,"\n"))) {
                gui_internal_widget_append(ret, gui_internal_label_new(this, tok));
                s2=NULL;
        }
+       gui_internal_widget_pack(this,ret);
        return ret;
 }
 
 
 static struct widget *
-gui_internal_button_new_with_callback(struct gui_priv *this, char *text, struct graphics_image *image, enum flags flags, void(*func)(struct gui_priv *priv, struct widget *widget), void *data)
+gui_internal_button_new_with_callback(struct gui_priv *this, char *text, struct graphics_image *image, enum flags flags, void(*func)(struct gui_priv *priv, struct widget *widget, void *data), void *data)
 {
        struct widget *ret=NULL;
        ret=gui_internal_box_new(this, flags);
@@ -565,7 +669,7 @@ gui_internal_button_new_with_callback(struct gui_priv *this, char *text, struct
                if (image)
                        gui_internal_widget_append(ret, gui_internal_image_new(this, image));
                if (text)
-                       gui_internal_widget_append(ret, gui_internal_text_new(this, text));
+                       gui_internal_widget_append(ret, gui_internal_text_new(this, text, gravity_center|orientation_vertical));
                ret->func=func;
                ret->data=data;
                if (func) {
@@ -616,21 +720,24 @@ gui_internal_button_attr_callback(struct gui_priv *this, struct widget *w)
                gui_internal_widget_render(this, w);
 }
 static void
-gui_internal_button_attr_pressed(struct gui_priv *this, struct widget *w)
+gui_internal_button_attr_pressed(struct gui_priv *this, struct widget *w, void *data)
 {
-       if (w->is_on) 
+       if (w->is_on)
                w->set_attr(w->instance, &w->off);
        else
                w->set_attr(w->instance, &w->on);
        gui_internal_button_attr_update(this, w);
-       
+
 }
 
 static struct widget *
 gui_internal_button_navit_attr_new(struct gui_priv *this, char *text, enum flags flags, struct attr *on, struct attr *off)
 {
-       struct graphics_image *image=image_new_xs(this, "gui_inactive");
+       struct graphics_image *image=NULL;
        struct widget *ret;
+       if (!on && !off)
+               return NULL;
+       image=image_new_xs(this, "gui_inactive");
        ret=gui_internal_button_new_with_callback(this, text, image, flags, gui_internal_button_attr_pressed, NULL);
        if (on)
                ret->on=*on;
@@ -640,7 +747,7 @@ gui_internal_button_navit_attr_new(struct gui_priv *this, char *text, enum flags
        ret->set_attr=(int (*)(void *, struct attr *))navit_set_attr;
        ret->remove_cb=(void (*)(void *, struct callback *))navit_remove_callback;
        ret->instance=this->nav;
-       ret->cb=callback_new_attr_2(callback_cast(gui_internal_button_attr_callback), on->type, this, ret);
+       ret->cb=callback_new_attr_2(callback_cast(gui_internal_button_attr_callback), on?on->type:off->type, this, ret);
        navit_add_callback(this->nav, ret->cb);
        gui_internal_button_attr_update(this, ret);
        return ret;
@@ -649,8 +756,11 @@ gui_internal_button_navit_attr_new(struct gui_priv *this, char *text, enum flags
 static struct widget *
 gui_internal_button_map_attr_new(struct gui_priv *this, char *text, enum flags flags, struct map *map, struct attr *on, struct attr *off, int deflt)
 {
-       struct graphics_image *image=image_new_xs(this, "gui_inactive");
+       struct graphics_image *image=NULL;
        struct widget *ret;
+       image=image_new_xs(this, "gui_inactive");
+       if (!on && !off)
+               return NULL;
        ret=gui_internal_button_new_with_callback(this, text, image, flags, gui_internal_button_attr_pressed, NULL);
        if (on)
                ret->on=*on;
@@ -662,7 +772,7 @@ gui_internal_button_map_attr_new(struct gui_priv *this, char *text, enum flags f
        ret->remove_cb=(void (*)(void *, struct callback *))map_remove_callback;
        ret->instance=map;
        ret->redraw=1;
-       ret->cb=callback_new_attr_2(callback_cast(gui_internal_button_attr_callback), on->type, this, ret);
+       ret->cb=callback_new_attr_2(callback_cast(gui_internal_button_attr_callback), on?on->type:off->type, this, ret);
        map_add_callback(map, ret->cb);
        gui_internal_button_attr_update(this, ret);
        return ret;
@@ -674,9 +784,10 @@ gui_internal_button_new(struct gui_priv *this, char *text, struct graphics_image
        return gui_internal_button_new_with_callback(this, text, image, flags, NULL, NULL);
 }
 
+#if 0
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 static void gui_internal_clear(struct gui_priv *this)
@@ -687,6 +798,7 @@ static void gui_internal_clear(struct gui_priv *this)
        pnt.y=0;
        graphics_draw_rectangle(gra, this->background, &pnt, this->root.w, this->root.h);
 }
+#endif
 
 static struct widget *
 gui_internal_find_widget(struct widget *wi, struct point *p, int flags)
@@ -694,17 +806,17 @@ gui_internal_find_widget(struct widget *wi, struct point *p, int flags)
        struct widget *ret,*child;
        GList *l=wi->children;
 
-       if (p) { 
+       if (p) {
                if (wi->p.x > p->x )
                        return NULL;
                if (wi->p.y > p->y )
                        return NULL;
-               if ( wi->p.x + wi->w < p->x) 
+               if ( wi->p.x + wi->w < p->x)
                        return NULL;
-               if ( wi->p.y + wi->h < p->y) 
+               if ( wi->p.y + wi->h < p->y)
                        return NULL;
        }
-       if (wi->state & flags) 
+       if (wi->state & flags)
                return wi;
        while (l) {
                child=l->data;
@@ -715,7 +827,7 @@ gui_internal_find_widget(struct widget *wi, struct point *p, int flags)
                l=g_list_next(l);
        }
        return NULL;
-       
+
 }
 
 static void
@@ -723,11 +835,11 @@ gui_internal_highlight_do(struct gui_priv *this, struct widget *found)
 {
        if (found == this->highlighted)
                return;
-       
+
        graphics_draw_mode(this->gra, draw_mode_begin);
        if (this->highlighted) {
                this->highlighted->state &= ~STATE_HIGHLIGHTED;
-               if (this->root.children && this->highlighted_menu == g_list_last(this->root.children)->data) 
+               if (this->root.children && this->highlighted_menu == g_list_last(this->root.children)->data)
                        gui_internal_widget_render(this, this->highlighted);
                this->highlighted=NULL;
                this->highlighted_menu=NULL;
@@ -738,12 +850,12 @@ gui_internal_highlight_do(struct gui_priv *this, struct widget *found)
                this->highlighted->state |= STATE_HIGHLIGHTED;
                gui_internal_widget_render(this, this->highlighted);
                dbg(1,"%d,%d %dx%d\n", found->p.x, found->p.y, found->w, found->h);
-       }       
+       }
        graphics_draw_mode(this->gra, draw_mode_end);
 }
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 static void gui_internal_highlight(struct gui_priv *this)
@@ -758,11 +870,11 @@ static void gui_internal_highlight(struct gui_priv *this)
 }
 
 static struct widget *
-gui_internal_box_new_with_label(struct gui_priv *this, enum flags flags, char *label)
+gui_internal_box_new_with_label(struct gui_priv *this, enum flags flags, const char *label)
 {
        struct widget *widget=g_new0(struct widget, 1);
 
-       if (label) 
+       if (label)
                widget->text=g_strdup(label);
        widget->type=widget_box;
        widget->flags=flags;
@@ -782,7 +894,8 @@ static void gui_internal_box_render(struct gui_priv *this, struct widget *w)
        GList *l;
 
        gui_internal_background_render(this, w);
-#if 0
+#if 1
+       if (w->foreground && w->border) {
        struct point pnt[5];
        pnt[0]=w->p;
         pnt[1].x=pnt[0].x+w->w;
@@ -792,17 +905,26 @@ static void gui_internal_box_render(struct gui_priv *this, struct widget *w)
         pnt[3].x=pnt[0].x;
         pnt[3].y=pnt[0].y+w->h;
         pnt[4]=pnt[0];
-       graphics_draw_lines(this->gra, this->foreground, pnt, 5);
+       graphics_gc_set_linewidth(w->foreground, w->border ? w->border : 1);
+       graphics_draw_lines(this->gra, w->foreground, pnt, 5);
+       graphics_gc_set_linewidth(w->foreground, 1);
+       }
 #endif
 
        l=w->children;
        while (l) {
-               wc=l->data;     
+               wc=l->data;
                gui_internal_widget_render(this, wc);
                l=g_list_next(l);
        }
 }
 
+
+/**
+ * @brief Compute the size and location for the widget.
+ *
+ *
+ */
 static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
 {
        struct widget *wc;
@@ -810,10 +932,10 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
        GList *l;
        int orientation=w->flags & 0xffff0000;
 
+       if (!cols)
+               cols=this->cols;
        if (!cols) {
-                height=navit_get_height(this->nav);
-                width=navit_get_width(this->nav);
-                if ( (height/width) > 1.0 )
+                if ( this->root.w > this->root.h )
                         cols=3;
                 else
                         cols=2;
@@ -821,7 +943,10 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                 height=0;
        }
 
-       
+
+       /**
+        * count the number of children
+        */
        l=w->children;
        while (l) {
                count++;
@@ -831,6 +956,14 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                orientation=orientation_horizontal;
        switch (orientation) {
        case orientation_horizontal:
+               /**
+                * For horizontal orientation:
+                * pack each child and find the largest height and
+                * compute the total width. x spacing (spx) is considered
+                *
+                * If any children want to be expanded
+                * we keep track of this
+                */
                l=w->children;
                while (l) {
                        wc=l->data;
@@ -852,6 +985,14 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                        expand=100;
                break;
        case orientation_vertical:
+               /**
+                * For vertical layouts:
+                * We pack each child and compute the largest width and
+                * the total height.  y spacing (spy) is considered
+                *
+                * If the expand flag is set then teh expansion amount
+                * is computed.
+                */
                l=w->children;
                while (l) {
                        wc=l->data;
@@ -873,6 +1014,13 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                        expand=100;
                break;
        case orientation_horizontal_vertical:
+               /**
+                * For horizontal_vertical orientation
+                * pack the children.
+                * Compute the largest height and largest width.
+                * Layout the widgets based on having the
+                * number of columns specified by (cols)
+                */
                count=0;
                l=w->children;
                while (l) {
@@ -880,7 +1028,7 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                        gui_internal_widget_pack(this, wc);
                        if (height < wc->h)
                                height=wc->h;
-                       if (width < wc->w) 
+                       if (width < wc->w)
                                width=wc->w;
                        l=g_list_next(l);
                        count++;
@@ -897,13 +1045,31 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                expand=100;
                break;
        default:
+               /**
+                * No orientation was specified.
+                * width and height are both 0.
+                * The width & height of this widget
+                * will be used.
+                */
+               if(!w->w && !w->h)
+                       dbg(0,"Warning width and height of a widget are 0");
                break;
        }
        if (! w->w && ! w->h) {
                w->w=w->bl+w->br+width;
                w->h=w->bt+w->bb+height;
        }
-       if (w->flags & gravity_left) 
+       if (expand < 100)
+               expand=100;
+
+       /**
+        * At this stage the width and height of this
+        * widget has been computed.
+        * We now make a second pass assigning heights,
+        * widths and coordinates to each child widget.
+        */
+
+       if (w->flags & gravity_left)
                x=w->p.x+w->bl;
        if (w->flags & gravity_xcenter)
                x=w->p.x+w->w/2-owidth/2;
@@ -911,9 +1077,9 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                x=w->p.x+w->w-w->br-owidth;
        if (w->flags & gravity_top)
                y=w->p.y+w->bt;
-       if (w->flags & gravity_ycenter) 
+       if (w->flags & gravity_ycenter)
                y=w->p.y+w->h/2-oheight/2;
-       if (w->flags & gravity_bottom) 
+       if (w->flags & gravity_bottom)
                y=w->p.y+w->h-w->bb-oheight;
        l=w->children;
        switch (orientation) {
@@ -929,11 +1095,11 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                                        wc->w=1;
                                wc->w=wc->w*expand/100;
                        }
-                       if (w->flags & gravity_top) 
+                       if (w->flags & gravity_top)
                                wc->p.y=y;
-                       if (w->flags & gravity_ycenter) 
+                       if (w->flags & gravity_ycenter)
                                wc->p.y=y-wc->h/2;
-                       if (w->flags & gravity_bottom) 
+                       if (w->flags & gravity_bottom)
                                wc->p.y=y-wc->h;
                        x+=wc->w+w->spx;
                        l=g_list_next(l);
@@ -951,11 +1117,11 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                                        wc->h=1;
                                wc->h=wc->h*expand/100;
                        }
-                       if (w->flags & gravity_left) 
+                       if (w->flags & gravity_left)
                                wc->p.x=x;
-                       if (w->flags & gravity_xcenter) 
+                       if (w->flags & gravity_xcenter)
                                wc->p.x=x-wc->w/2;
-                       if (w->flags & gravity_right) 
+                       if (w->flags & gravity_right)
                                wc->p.x=x-wc->w;
                        y+=wc->h+w->spy;
                        l=g_list_next(l);
@@ -975,17 +1141,17 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                                wc->w=width;
                                wc->h=height;
                        }
-                       if (w->flags & gravity_left) 
+                       if (w->flags & gravity_left)
                                wc->p.x=x;
-                       if (w->flags & gravity_xcenter) 
+                       if (w->flags & gravity_xcenter)
                                wc->p.x=x+(width-wc->w)/2;
-                       if (w->flags & gravity_right) 
+                       if (w->flags & gravity_right)
                                wc->p.x=x+width-wc->w;
-                       if (w->flags & gravity_top) 
+                       if (w->flags & gravity_top)
                                wc->p.y=y;
-                       if (w->flags & gravity_ycenter) 
+                       if (w->flags & gravity_ycenter)
                                wc->p.y=y+(height-wc->h)/2;
-                       if (w->flags & gravity_bottom) 
+                       if (w->flags & gravity_bottom)
                                wc->p.y=y-height-wc->h;
                        x+=width;
                        if (++count == cols) {
@@ -999,6 +1165,11 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
        default:
                break;
        }
+       /**
+        * Call pack again on each child,
+        * the child has now had its size and coordinates
+        * set so they can repack their children.
+        */
        l=w->children;
        while (l) {
                wc=l->data;
@@ -1010,11 +1181,20 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
 static void
 gui_internal_widget_append(struct widget *parent, struct widget *child)
 {
+       if (! child)
+               return;
        if (! child->background)
                child->background=parent->background;
        parent->children=g_list_append(parent->children, child);
 }
 
+static void gui_internal_widget_prepend(struct widget *parent, struct widget *child)
+{
+       if (! child->background)
+               child->background=parent->background;
+       parent->children=g_list_prepend(parent->children, child);
+}
+
 static void gui_internal_widget_children_destroy(struct gui_priv *this, struct widget *w)
 {
        GList *l;
@@ -1033,6 +1213,7 @@ static void gui_internal_widget_children_destroy(struct gui_priv *this, struct w
 static void gui_internal_widget_destroy(struct gui_priv *this, struct widget *w)
 {
        gui_internal_widget_children_destroy(this, w);
+       g_free(w->command);
        g_free(w->speech);
        g_free(w->text);
        if (w->img)
@@ -1045,14 +1226,17 @@ static void gui_internal_widget_destroy(struct gui_priv *this, struct widget *w)
                w->data_free(w->data);
        if (w->cb && w->remove_cb)
                w->remove_cb(w->instance, w->cb);
-       g_free(w);
+       if(w->free)
+               w->free(this,w);
+       else
+               g_free(w);
 }
 
 
 static void
 gui_internal_widget_render(struct gui_priv *this, struct widget *w)
 {
-       if(w->p.x > navit_get_width(this->nav) || w->p.y > navit_get_height(this->nav))
+       if(w->p.x > this->root.w || w->p.y > this->root.h)
                return;
 
        switch (w->type) {
@@ -1088,8 +1272,8 @@ gui_internal_widget_pack(struct gui_priv *this, struct widget *w)
 }
 
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 static void gui_internal_call_highlighted(struct gui_priv *this)
@@ -1097,7 +1281,7 @@ static void gui_internal_call_highlighted(struct gui_priv *this)
        if (! this->highlighted || ! this->highlighted->func)
                return;
        this->highlighted->reason=1;
-       this->highlighted->func(this, this->highlighted);
+       this->highlighted->func(this, this->highlighted, this->highlighted->data);
 }
 
 static void
@@ -1121,11 +1305,21 @@ static void
 gui_internal_prune_menu(struct gui_priv *this, struct widget *w)
 {
        GList *l;
+       struct widget *wr;
        gui_internal_search_idle_end(this);
        while ((l = g_list_last(this->root.children))) {
                if (l->data == w) {
+                       void (*redisplay)(struct gui_priv *priv, struct widget *widget, void *data);
                        gui_internal_say(this, w, 0);
-                       gui_internal_widget_render(this, w);
+                       redisplay=w->menu_data->redisplay;
+                       wr=w->menu_data->redisplay_widget;
+                       if (!w->menu_data->redisplay) {
+                               gui_internal_widget_render(this, w);
+                               return;
+                       }
+                       gui_internal_widget_destroy(this, l->data);
+                       this->root.children=g_list_remove(this->root.children, l->data);
+                       redisplay(this, wr, wr->data);
                        return;
                }
                gui_internal_widget_destroy(this, l->data);
@@ -1149,19 +1343,34 @@ gui_internal_prune_menu_count(struct gui_priv *this, int count, int render)
 }
 
 static void
-gui_internal_back(struct gui_priv *this, struct widget *w)
+gui_internal_back(struct gui_priv *this, struct widget *w, void *data)
 {
        gui_internal_prune_menu_count(this, 1, 1);
 }
 
 static void
-gui_internal_cmd_return(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_return(struct gui_priv *this, struct widget *wm, void *data)
 {
        gui_internal_prune_menu(this, wm->data);
 }
 
 static void
-gui_internal_cmd_main_menu(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd2_back(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
+{
+       graphics_draw_mode(this->gra, draw_mode_begin);
+       gui_internal_back(this, NULL, NULL);
+       graphics_draw_mode(this->gra, draw_mode_end);
+       gui_internal_check_exit(this);  
+}
+
+static void
+gui_internal_cmd2_back_to_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
+{
+       gui_internal_prune_menu(this, NULL);
+}
+
+static void
+gui_internal_cmd_main_menu(struct gui_priv *this, struct widget *wm, void *data)
 {
        gui_internal_prune_menu(this, this->root.children->data);
 }
@@ -1173,36 +1382,68 @@ gui_internal_top_bar(struct gui_priv *this)
        int dots_len, sep_len;
        GList *res=NULL,*l;
        int width,width_used=0,use_sep=0,incomplete=0;
+       struct graphics_gc *foreground=(this->flags & 256 ? this->background : this->text_foreground);
+/* flags
+        1:Don't expand bar to screen width
+        2:Don't show Map Icon
+        4:Don't show Home Icon
+        8:Show only current menu
+        16:Don't use menu titles as button
+        32:Show navit version
+       64:Show time
+       128:Show help
+       256:Use background for menu headline
+       512:Set osd_configuration and zoom to route when setting position
+       1024:Don't show back button
+       2048:No highlighting of keyboard
+*/
 
-       w=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill);
+       w=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|(this->flags & 1 ? 0:flags_fill));
        w->bl=this->spacing;
        w->spx=this->spacing;
        w->background=this->background2;
-       wm=gui_internal_button_new_with_callback(this, NULL,
-               image_new_s(this, "gui_map"), gravity_center|orientation_vertical,
-               gui_internal_cmd_return, NULL);
-       wm->speech=g_strdup(_("Back to map"));
-       gui_internal_widget_pack(this, wm);
-       wh=gui_internal_button_new_with_callback(this, NULL,
-               image_new_s(this, "gui_home"), gravity_center|orientation_vertical,
-               gui_internal_cmd_main_menu, NULL);
-       wh->speech=g_strdup(_("Main Menu"));
-       gui_internal_widget_pack(this, wh);
-       gui_internal_widget_append(w, wm);
-       gui_internal_widget_append(w, wh);
-       width=this->root.w-w->bl-wm->w-w->spx-wh->w;
+       if ((this->flags & 6) == 6) {
+               w->bl=10;
+               w->br=10;
+               w->bt=6;
+               w->bb=6;
+       }
+       width=this->root.w-w->bl;
+       if (! (this->flags & 2)) {
+               wm=gui_internal_button_new_with_callback(this, NULL,
+                       image_new_s(this, "gui_map"), gravity_center|orientation_vertical,
+                       gui_internal_cmd_return, NULL);
+               wm->speech=g_strdup(_("Back to map"));
+               gui_internal_widget_pack(this, wm);
+               gui_internal_widget_append(w, wm);
+               width-=wm->w;
+       }
+       if (! (this->flags & 4)) {
+               wh=gui_internal_button_new_with_callback(this, NULL,
+                       image_new_s(this, "gui_home"), gravity_center|orientation_vertical,
+                       gui_internal_cmd_main_menu, NULL);
+               wh->speech=g_strdup(_("Main Menu"));
+               gui_internal_widget_pack(this, wh);
+               gui_internal_widget_append(w, wh);
+               width-=wh->w;
+       }
+       if (!(this->flags & 6))
+               width-=w->spx;
        l=g_list_last(this->root.children);
        wcn=gui_internal_label_new(this,".. »");
+       wcn->foreground=foreground;
        dots_len=wcn->w;
        gui_internal_widget_destroy(this, wcn);
        wcn=gui_internal_label_new(this,"»");
+       wcn->foreground=foreground;
        sep_len=wcn->w;
        gui_internal_widget_destroy(this, wcn);
        while (l) {
                if (g_list_previous(l) || !g_list_next(l)) {
                        wc=l->data;
                        wcn=gui_internal_label_new(this, wc->text);
-                       if (g_list_next(l)) 
+                       wcn->foreground=foreground;
+                       if (g_list_next(l))
                                use_sep=1;
                        else
                                use_sep=0;
@@ -1213,21 +1454,27 @@ gui_internal_top_bar(struct gui_priv *this)
                                break;
                        }
                        if (use_sep) {
-                               res=g_list_prepend(res, gui_internal_label_new(this, "»"));
+                               struct widget *wct=gui_internal_label_new(this, "»");
+                               wct->foreground=foreground;
+                               res=g_list_prepend(res, wct);
                                width_used+=sep_len+w->spx;
                        }
                        width_used+=wcn->w;
-                       wcn->func=gui_internal_cmd_return;
-                       wcn->data=wc;
-                       wcn->state |= STATE_SENSITIVE;
+                       if (!(this->flags & 16)) {
+                               wcn->func=gui_internal_cmd_return;
+                               wcn->data=wc;
+                               wcn->state |= STATE_SENSITIVE;
+                       }
                        res=g_list_prepend(res, wcn);
-                       
+                       if (this->flags & 8)
+                               break;
                }
                l=g_list_previous(l);
        }
        if (incomplete) {
                if (! res) {
                        wcn=gui_internal_label_new_abbrev(this, wc->text, width-width_used-w->spx-dots_len);
+                       wcn->foreground=foreground;
                        wcn->func=gui_internal_cmd_return;
                        wcn->data=wc;
                        wcn->state |= STATE_SENSITIVE;
@@ -1236,6 +1483,7 @@ gui_internal_top_bar(struct gui_priv *this)
                        wc=l->data;
                }
                wcn=gui_internal_label_new(this, ".. »");
+               wcn->foreground=foreground;
                wcn->func=gui_internal_cmd_return;
                wcn->data=wc;
                wcn->state |= STATE_SENSITIVE;
@@ -1246,6 +1494,14 @@ gui_internal_top_bar(struct gui_priv *this)
                gui_internal_widget_append(w, l->data);
                l=g_list_next(l);
        }
+       if (this->flags & 32) {
+               extern char *version;
+               char *version_text=g_strdup_printf("Navit %s",version);
+               wcn=gui_internal_label_new(this, version_text);
+               g_free(version_text);
+               wcn->flags=gravity_right_center|flags_expand;
+               gui_internal_widget_append(w, wcn);
+       }
 #if 0
        if (dots)
                gui_internal_widget_destroy(this, dots);
@@ -1253,6 +1509,42 @@ gui_internal_top_bar(struct gui_priv *this)
        return w;
 }
 
+static struct widget *
+gui_internal_time_help(struct gui_priv *this)
+{
+       struct widget *w,*wc,*wcn;
+       char timestr[64];
+       struct tm *tm;
+       time_t timep;
+
+       w=gui_internal_box_new(this, gravity_right_center|orientation_horizontal|flags_fill);
+       w->bl=this->spacing;
+       w->spx=this->spacing;
+       w->spx=10;
+       w->bl=10;
+       w->br=10;
+       w->bt=6;
+       w->bb=6;
+       if (this->flags & 64) {
+               wc=gui_internal_box_new(this, gravity_right_top|orientation_vertical|flags_fill);
+               wc->bl=10;
+               wc->br=20;
+               wc->bt=6;
+               wc->bb=6;
+               timep=time(NULL);
+               tm=localtime(&timep);
+               strftime(timestr, 64, "%H:%M %d.%m.%Y", tm);
+               wcn=gui_internal_label_new(this, timestr);
+               gui_internal_widget_append(wc, wcn);
+               gui_internal_widget_append(w, wc);
+       }
+       if (this->flags & 128) {
+               wcn=gui_internal_button_new_with_callback(this, _("Help"), image_new_l(this, "gui_help"), gravity_center|orientation_vertical|flags_fill, NULL, NULL);
+               gui_internal_widget_append(w, wcn);
+       }
+       return w;
+}
+
 
 /**
  * Applys the configuration values to this based on the settings
@@ -1268,12 +1560,13 @@ static void gui_internal_apply_config(struct gui_priv *this)
 {
   struct gui_config_settings *  current_config=0;
 
+  dbg(1,"w=%d h=%d\n", this->root.w, this->root.h);
   /**
    * Select default values from profile based on the screen.
    */
-  if(this->root.w > 320 || this->root.h > 320)
+  if((this->root.w > 320 || this->root.h > 320) && this->root.w > 240 && this->root.h > 240)
   {
-    if(this->root.w > 640 || this->root.h > 640) 
+    if((this->root.w > 640 || this->root.h > 640) && this->root.w > 480 && this->root.h > 480 )
     {
       current_config = &config_profiles[LARGE_PROFILE];
     }
@@ -1286,7 +1579,7 @@ static void gui_internal_apply_config(struct gui_priv *this)
   {
     current_config = &config_profiles[SMALL_PROFILE];
   }
-  
+
   /**
    * Apply override values from config file
    */
@@ -1307,7 +1600,7 @@ static void gui_internal_apply_config(struct gui_priv *this)
   {
     this->icon_xs = this->config.icon_xs;
   }
-  
+
   if(this->config.icon_s == -1 )
   {
     this->icon_s = current_config->icon_s;
@@ -1332,30 +1625,85 @@ static void gui_internal_apply_config(struct gui_priv *this)
   {
     this->spacing = current_config->spacing;
   }
-               
+
 }
 
 static struct widget *
-gui_internal_menu(struct gui_priv *this, char *label)
+gui_internal_button_label(struct gui_priv *this, char *label, int mode)
 {
-       struct widget *menu,*w;
-       
+       struct widget *wl,*wlb;
+       struct widget *wb=gui_internal_menu_data(this)->button_bar;
+       wlb=gui_internal_box_new(this, gravity_right_center|orientation_vertical);
+       wl=gui_internal_label_new(this, label);
+       wlb->border=1;
+       wlb->foreground=this->text_foreground;
+       wlb->bl=20;
+       wlb->br=20;
+       wlb->bb=6;
+       wlb->bt=6;
+       gui_internal_widget_append(wlb, wl);
+       if (mode == 1)
+               gui_internal_widget_prepend(wb, wlb);
+       if (mode == -1)
+               gui_internal_widget_append(wb, wlb);
+
+       return wlb;
+}
+
+
+static struct widget *
+gui_internal_menu(struct gui_priv *this, const char *label)
+{
+       struct widget *menu,*w,*w1,*topbox;
 
        gui_internal_search_idle_end(this);
-       menu=gui_internal_box_new_with_label(this, gravity_center|orientation_vertical, label);
+       topbox=gui_internal_box_new_with_label(this, 0, label);
+        topbox->w=this->root.w;
+        topbox->h=this->root.h;
+        gui_internal_widget_append(&this->root, topbox);
+       menu=gui_internal_box_new(this, gravity_left_center|orientation_vertical);
        menu->w=this->root.w;
        menu->h=this->root.h;
        menu->background=this->background;
        gui_internal_apply_config(this);
        this->font=graphics_font_new(this->gra,this->font_size,1);
-       menu->menu_data=g_new0(struct menu_data, 1);
-       gui_internal_widget_append(&this->root, menu);
+       topbox->menu_data=g_new0(struct menu_data, 1);
+       gui_internal_widget_append(topbox, menu);
        w=gui_internal_top_bar(this);
        gui_internal_widget_append(menu, w);
        w=gui_internal_box_new(this, gravity_center|orientation_horizontal_vertical|flags_expand|flags_fill);
        w->spx=4*this->spacing;
+       w->w=menu->w;
        gui_internal_widget_append(menu, w);
-
+       if (this->flags & 16 && (!this->flags & 1024)) {
+               struct widget *wlb,*wb,*wm=w;
+               wm->flags=gravity_center|orientation_vertical|flags_expand|flags_fill;
+               w=gui_internal_box_new(this, gravity_center|orientation_horizontal|flags_expand|flags_fill);
+               dbg(0,"topbox->menu_data=%p\n", topbox->menu_data);
+               gui_internal_widget_append(wm, w);
+               wb=gui_internal_box_new(this, gravity_right_center|orientation_horizontal|flags_fill);
+               wb->bl=6;
+               wb->br=6;
+               wb->bb=6;
+               wb->bt=6;
+               wb->spx=6;
+               topbox->menu_data->button_bar=wb;
+               gui_internal_widget_append(wm, wb);
+               wlb=gui_internal_button_label(this,_("Back"),1);
+               wlb->func=gui_internal_back;
+               wlb->state |= STATE_SENSITIVE;
+       }
+       if (this->flags & 192) {
+               menu=gui_internal_box_new(this, gravity_left_center|orientation_vertical);
+               menu->w=this->root.w;
+               menu->h=this->root.h;
+               w1=gui_internal_time_help(this);
+               gui_internal_widget_append(menu, w1);
+               w1=gui_internal_box_new(this, gravity_center|orientation_horizontal_vertical|flags_expand|flags_fill);
+               gui_internal_widget_append(menu, w1);
+               gui_internal_widget_append(topbox, menu);
+               menu->background=NULL;
+       }
        return w;
 }
 
@@ -1384,19 +1732,26 @@ gui_internal_menu_render(struct gui_priv *this)
 }
 
 static void
-gui_internal_cmd_set_destination(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_set_destination(struct gui_priv *this, struct widget *wm, void *data)
 {
-       struct widget *w=wm->data;
-       dbg(0,"c=%d:0x%x,0x%x\n", w->c.pro, w->c.x, w->c.y);
-       navit_set_destination(this->nav, &w->c, w->name);
+       char *name=data;
+       dbg(0,"c=%d:0x%x,0x%x\n", wm->c.pro, wm->c.x, wm->c.y);
+       navit_set_destination(this->nav, &wm->c, name, 1);
+       if (this->flags & 512) {
+               struct attr follow;
+               follow.type=attr_follow;
+               follow.u.num=180;
+               navit_set_attr(this->nav, &this->osd_configuration);
+               navit_set_attr(this->nav, &follow);
+               navit_zoom_to_route(this->nav, 0);
+       }
        gui_internal_prune_menu(this, NULL);
 }
 
 static void
-gui_internal_cmd_set_position(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_set_position(struct gui_priv *this, struct widget *wm, void *data)
 {
-       struct widget *w=wm->data;
-       navit_set_position(this->nav, &w->c);
+       navit_set_position(this->nav, &wm->c);
        gui_internal_prune_menu(this, NULL);
 }
 
@@ -1405,7 +1760,7 @@ gui_internal_cmd_add_bookmark_do(struct gui_priv *this, struct widget *widget)
 {
        GList *l;
        dbg(0,"text='%s'\n", widget->text);
-       if (widget->text && strlen(widget->text)) 
+       if (widget->text && strlen(widget->text))
                navit_add_bookmark(this->nav, &widget->c, widget->text);
        g_free(widget->text);
        widget->text=NULL;
@@ -1414,13 +1769,13 @@ gui_internal_cmd_add_bookmark_do(struct gui_priv *this, struct widget *widget)
 }
 
 static void
-gui_internal_cmd_add_bookmark_clicked(struct gui_priv *this, struct widget *widget)
+gui_internal_cmd_add_bookmark_clicked(struct gui_priv *this, struct widget *widget, void *data)
 {
        gui_internal_cmd_add_bookmark_do(this, widget->data);
 }
 
 static void
-gui_internal_cmd_add_bookmark_changed(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_add_bookmark_changed(struct gui_priv *this, struct widget *wm, void *data)
 {
        int len;
        dbg(1,"enter\n");
@@ -1438,15 +1793,16 @@ gui_internal_cmd_add_bookmark_changed(struct gui_priv *this, struct widget *wm)
 static struct widget * gui_internal_keyboard(struct gui_priv *this, int mode);
 
 static void
-gui_internal_cmd_add_bookmark(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_add_bookmark2(struct gui_priv *this, struct widget *wm, void *data)
 {
-       struct widget *w,*wb,*wk,*wl,*we,*wnext,*wp=wm->data;
-       wb=gui_internal_menu(this, "Add Bookmark");     
+       struct widget *w,*wb,*wk,*wl,*we,*wnext;
+       char *name=data;
+       wb=gui_internal_menu(this,_("Add Bookmark"));
        w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill);
        gui_internal_widget_append(wb, w);
        we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill);
        gui_internal_widget_append(w, we);
-       gui_internal_widget_append(we, wk=gui_internal_label_new(this, wp->name ? wp->name : wp->text));
+       gui_internal_widget_append(we, wk=gui_internal_label_new(this, name));
        wk->state |= STATE_EDIT|STATE_CLEAR;
        wk->background=this->background;
        wk->flags |= flags_expand|flags_fill;
@@ -1503,6 +1859,7 @@ struct selector {
                type_poi_hotel,type_poi_camp_rv,
                type_poi_camping,type_poi_camping,
                type_poi_resort,type_poi_resort,
+               type_poi_motel,type_poi_hostel,
                type_none}},
        {"restaurant","Restaurant",(enum item_type []) {
                type_poi_bar,type_poi_picnic,
@@ -1520,7 +1877,6 @@ struct selector {
                type_poi_police,type_poi_autoservice,
                type_poi_information,type_poi_information,
                type_poi_personal_service,type_poi_repair_service,
-               type_poi_rest_room,type_poi_rest_room,
                type_poi_restroom,type_poi_restroom,
                type_none}},
        {"parking","Parking",(enum item_type []){type_poi_car_parking,type_poi_car_parking,type_none}},
@@ -1529,7 +1885,8 @@ struct selector {
                type_poi_dam,type_poi_dam,
                type_none}},
        {"unknown","Other",(enum item_type []){
-               type_point_unspecified,type_poi_land_feature-1,
+               type_point_unspecified,type_point_unkn-1,
+               type_point_unkn+1,type_poi_land_feature-1,
                type_poi_rock+1,type_poi_fuel-1,
                type_poi_marina+1,type_poi_car_parking-1,
                type_poi_car_parking+1,type_poi_bar-1,
@@ -1539,11 +1896,15 @@ struct selector {
                type_poi_mall+1,type_poi_personal_service-1,
                type_poi_restaurant+1,type_poi_restroom-1,
                type_poi_restroom+1,type_poi_shop_grocery-1,
-               type_poi_shop_grocery+1,type_poi_wifi,
+               type_poi_shop_grocery+1,type_poi_motel-1,
+               type_poi_hostel+1,type_selected_point,
+               type_none}},
+       {"unknown","Unknown",(enum item_type []){
+               type_point_unkn,type_point_unkn,
                type_none}},
 };
 
-static void gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm);
+static void gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm, void *data);
 
 static struct widget *
 gui_internal_cmd_pois_selector(struct gui_priv *this, struct pcoord *c)
@@ -1568,7 +1929,7 @@ gui_internal_cmd_pois_item(struct gui_priv *this, struct coord *center, struct i
        char dirbuf[32];
        char *type;
        struct attr attr;
-       struct widget *wl;
+       struct widget *wl,*wt;
        char *text;
 
        wl=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill);
@@ -1583,7 +1944,9 @@ gui_internal_cmd_pois_item(struct gui_priv *this, struct coord *center, struct i
                wl->name=g_strdup(type);
        }
         text=g_strdup_printf("%s %s %s %s", distbuf, dirbuf, type, attr.u.str);
-       gui_internal_widget_append(wl, gui_internal_label_new(this, text));
+       wt=gui_internal_label_new(this, text);
+       wt->datai=dist;
+       gui_internal_widget_append(wl, wt);
        g_free(text);
 
        return wl;
@@ -1596,11 +1959,15 @@ gui_internal_cmd_pois_sort_num(gconstpointer a, gconstpointer b, gpointer user_d
        const struct widget *wb=b;
        struct widget *wac=wa->children->data;
        struct widget *wbc=wb->children->data;
+#if 0
        int ia,ib;
        ia=atoi(wac->text);
        ib=atoi(wbc->text);
 
        return ia-ib;
+#else
+       return wac->datai-wbc->datai;
+#endif
 }
 
 static int
@@ -1616,15 +1983,15 @@ gui_internal_cmd_pois_item_selected(struct selector *sel, enum item_type type)
                if (type >= types[0] && type <= types[1]) {
                        return 1;
                }
-               types+=2;       
-       }       
+               types+=2;
+       }
        return 0;
 }
 
-static void gui_internal_cmd_position(struct gui_priv *this, struct widget *wm);
+static void gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data);
 
 static void
-gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm, void *data)
 {
        struct map_selection *sel,*selm;
        struct coord c,center;
@@ -1632,7 +1999,7 @@ gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm)
        struct map *m;
        struct map_rect *mr;
        struct item *item;
-       int idist,dist=4000;
+       int idist,dist=20000;
        struct widget *wi,*w,*w2,*wb;
        enum projection pro=wm->c.pro;
        struct selector *isel=wm->data;
@@ -1655,12 +2022,14 @@ gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm)
                dbg(2,"mr=%p\n", mr);
                if (mr) {
                        while ((item=map_rect_get_item(mr))) {
-                               if (gui_internal_cmd_pois_item_selected(isel, item->type) && 
-                                   item_coord_get_pro(item, &c, 1, pro) && 
-                                   coord_rect_contains(&sel->u.c_rect, &c) && 
+                               if (gui_internal_cmd_pois_item_selected(isel, item->type) &&
+                                   item_coord_get_pro(item, &c, 1, pro) &&
+                                   coord_rect_contains(&sel->u.c_rect, &c) &&
                                    (idist=transform_distance(pro, &center, &c)) < dist) {
                                        gui_internal_widget_append(w2, wi=gui_internal_cmd_pois_item(this, &center, item, &c, idist));
                                        wi->func=gui_internal_cmd_position;
+                                       wi->data=(void *)2;
+                                       wi->item=*item;
                                        wi->state |= STATE_SENSITIVE;
                                        wi->c.x=c.x;
                                        wi->c.y=c.y;
@@ -1678,22 +2047,75 @@ gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm)
 }
 
 static void
-gui_internal_cmd_view_on_map(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_view_on_map(struct gui_priv *this, struct widget *wm, void *data)
 {
        struct widget *w=wm->data;
-       navit_set_center(this->nav, &w->c);
+       int highlight=(w->data == (void *)2 || w->data == (void *)3 || w->data == (void *)4);
+       if (highlight) {
+               graphics_clear_selection(this->gra, NULL);
+               graphics_add_selection(this->gra, &w->item, NULL);
+       }
+       navit_set_center(this->nav, &w->c, 1);
        gui_internal_prune_menu(this, NULL);
 }
 
 
 static void
-gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_view_attribute_details(struct gui_priv *this, struct widget *wm, void *data)
+{
+       struct widget *w,*wb;
+       struct map_rect *mr;
+       struct item *item;
+       struct attr attr;
+       char *text,*url;
+       int i;
+
+       text=g_strdup_printf("Attribute %s",wm->name);
+       wb=gui_internal_menu(this, text);
+       g_free(text);
+       w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
+       gui_internal_widget_append(wb, w);
+       mr=map_rect_new(wm->item.map, NULL);
+       item = map_rect_get_item_byid(mr, wm->item.id_hi, wm->item.id_lo);
+       for (i = 0 ; i < wm->datai ; i++) {
+               item_attr_get(item, attr_any, &attr);
+       }
+       if (item_attr_get(item, attr_any, &attr)) {
+               url=NULL;
+               switch (attr.type) {
+               case attr_osm_nodeid:
+                       url=g_strdup_printf("http://www.openstreetmap.org/browse/node/%Ld\n",*attr.u.num64);
+                       break;
+               case attr_osm_wayid:
+                       url=g_strdup_printf("http://www.openstreetmap.org/browse/way/%Ld\n",*attr.u.num64);
+                       break;
+               case attr_osm_relationid:
+                       url=g_strdup_printf("http://www.openstreetmap.org/browse/relation/%Ld\n",*attr.u.num64);
+                       break;
+               default:
+                       break;
+               }
+               if (url) {      
+                       gui_internal_widget_append(w,
+                                       wb=gui_internal_button_new_with_callback(this, _("View in Browser"),
+                                               image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
+                                               gui_internal_cmd_view_in_browser, NULL));
+                       wb->name=url;
+               }
+       }
+       map_rect_destroy(mr);
+       gui_internal_menu_render(this);
+}
+
+static void
+gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm, void *data)
 {
        struct widget *w,*wb;
        struct map_rect *mr;
        struct item *item;
        struct attr attr;
        char *text;
+       int count=0;
 
        dbg(0,"item=%p 0x%x 0x%x\n", wm->item.map,wm->item.id_hi, wm->item.id_lo);
        wb=gui_internal_menu(this, "Attributes");
@@ -1708,7 +2130,10 @@ gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm)
                        gui_internal_widget_append(w,
                        wb=gui_internal_button_new_with_callback(this, text,
                                NULL, gravity_left_center|orientation_horizontal|flags_fill,
-                               gui_internal_cmd_view_attributes, NULL));
+                               gui_internal_cmd_view_attribute_details, NULL));
+                       wb->name=g_strdup(text);
+                       wb->item=wm->item;
+                       wb->datai=count++;
                        g_free(text);
                }
        }
@@ -1717,24 +2142,28 @@ gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm)
 }
 
 static void
-gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void *data)
 {
        struct map_rect *mr;
        struct item *item;
        struct attr attr;
        char *cmd=NULL;
 
-       dbg(0,"item=%p 0x%x 0x%x\n", wm->item.map,wm->item.id_hi, wm->item.id_lo);
-       mr=map_rect_new(wm->item.map, NULL);
-       item = map_rect_get_item_byid(mr, wm->item.id_hi, wm->item.id_lo);
-       dbg(0,"item=%p\n", item);
-       if (item) {
-               while(item_attr_get(item, attr_url_local, &attr)) {
-                       if (! cmd)
-                               cmd=g_strdup_printf("navit-browser.sh '%s' &",attr.u.str);
+       if (!wm->name) {
+               dbg(0,"item=%p 0x%x 0x%x\n", wm->item.map,wm->item.id_hi, wm->item.id_lo);
+               mr=map_rect_new(wm->item.map, NULL);
+               item = map_rect_get_item_byid(mr, wm->item.id_hi, wm->item.id_lo);
+               dbg(0,"item=%p\n", item);
+               if (item) {
+                       while(item_attr_get(item, attr_url_local, &attr)) {
+                               if (! cmd)
+                                       cmd=g_strdup_printf("navit-browser.sh '%s' &",attr.u.str);
+                       }
                }
+               map_rect_destroy(mr);
+       } else {
+               cmd=g_strdup_printf("navit-browser.sh '%s' &",wm->name);
        }
-       map_rect_destroy(mr);
        if (cmd) {
 #ifdef HAVE_SYSTEM
                system(cmd);
@@ -1745,68 +2174,63 @@ gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm)
        }
 }
 
-/* wm->data: 0 Nothing special
-            1 Map Point
-            2 Item
-            3 Town 
-*/
-
-
 static void
-gui_internal_cmd_position(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct coord_geo *g_in, struct widget *wm, char *name, int flags)
 {
        struct widget *wb,*w,*wc,*wbc;
        struct coord_geo g;
+       struct pcoord pc;
        struct coord c;
-       char *coord,*name;
-       int display_attributes=(wm->data == (void *)2);
-       int display_view_on_map=(wm->data != (void *)1);
-       int display_items=(wm->data == (void *)1);
-       int display_streets=(wm->data == (void *)3);
-       if (wm->data == (void *)4) {
-               gui_internal_search_town_in_country(this, wm);
+       char *coord;
+
+       if (pc_in) {
+               pc=*pc_in;
+               c.x=pc.x;
+               c.y=pc.y;
+               dbg(0,"x=0x%x y=0x%x\n", c.x, c.y);
+               transform_to_geo(pc.pro, &c, &g);
+       } else if (g_in) {
+               struct attr attr;
+               if (!navit_get_attr(this->nav, attr_projection, &attr, NULL))
+                       return;
+               g=*g_in;
+               pc.pro=attr.u.projection;
+               transform_from_geo(pc.pro, &g, &c);
+               pc.x=c.x;
+               pc.y=c.y;
+       } else
                return;
-       }
-#if 0
-       switch ((int)wm->data) {
-               case 0:
-#endif
-                       c.x=wm->c.x;
-                       c.y=wm->c.y;
-                       dbg(0,"x=0x%x y=0x%x\n", c.x, c.y);
-                       transform_to_geo(wm->c.pro, &c, &g);
-#if 0
-                       break;
-               case 1:
-                       g=this->click;
-                       break;
-               case 2:
-                       g=this->vehicle;
-                       break;
-       }
-#endif
-       name=wm->name ? wm->name : wm->text;
-       wb=gui_internal_menu(this, name);       
+
+       wb=gui_internal_menu(this, name);
        w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
        gui_internal_widget_append(wb, w);
-       coord=coordinates(&wm->c, ' ');
+       coord=coordinates(&pc, ' ');
        gui_internal_widget_append(w, gui_internal_label_new(this, coord));
        g_free(coord);
-       if (display_streets) {
+       if ((flags & 1) && wm) {
                gui_internal_widget_append(w,
                        wc=gui_internal_button_new_with_callback(this, _("Streets"),
                                image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
                                gui_internal_search_street_in_town, wm));
                wc->item=wm->item;
+               wc->selection_id=wm->selection_id;
+       }
+       if ((flags & 2) && wm) {
+               gui_internal_widget_append(w,
+                       wc=gui_internal_button_new_with_callback(this, _("House numbers"),
+                               image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
+                               gui_internal_search_house_number_in_street, wm));
+               wc->item=wm->item;
+               wc->selection_id=wm->selection_id;
        }
-       if (display_attributes) {
+       if ((flags & 4) && wm) {
                struct map_rect *mr;
                struct item *item;
                struct attr attr;
                mr=map_rect_new(wm->item.map, NULL);
                item = map_rect_get_item_byid(mr, wm->item.id_hi, wm->item.id_lo);
                if (item) {
-                       if (item_attr_get(item, attr_description, &attr)) 
+                       if (item_attr_get(item, attr_description, &attr))
                                gui_internal_widget_append(w, gui_internal_label_new(this, attr.u.str));
                        if (item_attr_get(item, attr_url_local, &attr)) {
                                gui_internal_widget_append(w,
@@ -1823,39 +2247,48 @@ gui_internal_cmd_position(struct gui_priv *this, struct widget *wm)
                }
                map_rect_destroy(mr);
        }
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Set as destination"),
-                       image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
-                       gui_internal_cmd_set_destination, wm));
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Set as position"),
+       if (flags & 8) {
+               gui_internal_widget_append(w,
+                       wbc=gui_internal_button_new_with_callback(this, _("Set as destination"),
+                               image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
+                               gui_internal_cmd_set_destination, g_strdup(name)));
+               wbc->data_free=g_free;
+               wbc->c=pc;
+       }
+       if (flags & 16) {
+               gui_internal_widget_append(w,
+                       wbc=gui_internal_button_new_with_callback(this, _("Set as position"),
                        image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
                        gui_internal_cmd_set_position, wm));
-       gui_internal_widget_append(w,
-               wbc=gui_internal_button_new_with_callback(this, _("Add as bookmark"),
-                       image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
-                       gui_internal_cmd_add_bookmark, wm));
-       wbc->c=wm->c;
-       gui_internal_widget_append(w,
-               wbc=gui_internal_button_new_with_callback(this, _("POIs"),
+               wbc->c=pc;
+       }
+       if (flags & 32) {
+               gui_internal_widget_append(w,
+                       wbc=gui_internal_button_new_with_callback(this, _("Add as bookmark"),
                        image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
-                       gui_internal_cmd_pois, NULL));
-       wbc->c=wm->c;
+                       gui_internal_cmd_add_bookmark2, g_strdup(name)));
+               wbc->data_free=g_free;
+               wbc->c=pc;
+       }
+       if (flags & 64) {
+               gui_internal_widget_append(w,
+                       wbc=gui_internal_button_new_with_callback(this, _("POIs"),
+                               image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
+                               gui_internal_cmd_pois, NULL));
+               wbc->c=pc;
+       }
 #if 0
        gui_internal_widget_append(w,
                gui_internal_button_new(this, "Add to tour",
                        image_new_o(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill));
-       gui_internal_widget_append(w,
-               gui_internal_button_new(this, "Add as bookmark",
-                       image_new_o(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill));
 #endif
-       if (display_view_on_map) {
+       if (flags & 128) {
                gui_internal_widget_append(w,
                        gui_internal_button_new_with_callback(this, _("View on map"),
                                image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
                                gui_internal_cmd_view_on_map, wm));
        }
-       if (display_items) {
+       if (flags & 256) {
                int dist=10;
                struct mapset *ms;
                struct mapset_handle *h;
@@ -1892,7 +2325,7 @@ gui_internal_cmd_position(struct gui_priv *this, struct widget *wm)
                                                label=map_convert_string(m, attr.u.str);
                                                text=g_strdup_printf("%s %s", item_to_name(item->type), label);
                                                map_convert_free(label);
-                                       } else 
+                                       } else
                                                text=g_strdup_printf("%s", item_to_name(item->type));
                                        gui_internal_widget_append(w,
                                                wc=gui_internal_button_new_with_callback(this, text,
@@ -1911,31 +2344,108 @@ gui_internal_cmd_position(struct gui_priv *this, struct widget *wm)
                }
                mapset_close(h);
        }
-       
        gui_internal_menu_render(this);
 }
 
+
+/* wm->data: 0 Nothing special
+            1 Map Point
+            2 Item
+            3 Town
+            4 County
+            5 Street
+            6 House number 
+*/
+
+static void
+gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data)
+{
+       int flags;
+       switch ((int) wm->data) {
+       case 0:
+               flags=8|16|32|64|128|256;
+               break;
+       case 1:
+               flags=8|16|32|64|256;
+               break;
+       case 2:
+               flags=4|8|16|32|64;
+               break;
+       case 3:
+               flags=1|8|16|32|64|128;
+               flags &= this->flags_town;
+               break;
+       case 4:
+               gui_internal_search_town_in_country(this, wm);
+               return;
+       case 5:
+               flags=2|8|16|32|64|128;
+               flags &= this->flags_street;
+               break;
+       case 6:
+               flags=8|16|32|64|128;
+               flags &= this->flags_house_number;
+               break;
+       default:
+               return;
+       }
+       switch (flags) {
+       case 2:
+               gui_internal_search_house_number_in_street(this, wm, NULL);
+               return;
+       case 8:
+               gui_internal_cmd_set_destination(this, wm, NULL);
+               return;
+       }
+       gui_internal_cmd_position_do(this, &wm->c, NULL, wm, wm->name ? wm->name : wm->text, flags);
+}
+
+static void
+gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
+{
+       char *name=_("Position");
+       int flags=-1;
+
+       dbg(1,"enter\n");
+       if (!in || !in[0])
+               return;
+       if (!ATTR_IS_COORD_GEO(in[0]->type))
+               return;
+       if (in[1] && ATTR_IS_STRING(in[1]->type)) {
+               name=in[1]->u.str;
+               if (in[2] && ATTR_IS_INT(in[2]->type)) 
+                       flags=in[2]->u.num;
+       }
+       dbg(1,"flags=0x%x\n",flags);
+       gui_internal_cmd_position_do(this, NULL, in[0]->u.coord_geo, NULL, name, flags);
+}
+
 static void
-gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm, void *data)
 {
        struct attr attr,mattr;
        struct map_rect *mr=NULL;
        struct item *item;
-       char *label_full,*l,*prefix,*pos;
-       int len,plen,hassub;
+       char *label_full,*l,*prefix="",*pos;
+       int len,plen,hassub,found=0;
        struct widget *wb,*w,*wbm;
        GHashTable *hash;
        struct coord c;
+       char *text=_("Bookmarks");
+       if (wm && wm->text)
+               text=wm->text;
 
-
-       wb=gui_internal_menu(this, wm->text ? wm->text : _("Bookmarks"));
+       wb=gui_internal_menu(this, text);
        w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
        w->spy=this->spacing*3;
        gui_internal_widget_append(wb, w);
 
-       prefix=wm->prefix;
-       if (! prefix)
-               prefix="";
+       if (data)
+               prefix=data;
+       else {
+               if (wm && wm->prefix)
+                       prefix=wm->prefix;
+       }
        plen=strlen(prefix);
 
        if(navit_get_attr(this->nav, attr_bookmark_map, &mattr, NULL) && mattr.u.map && (mr=map_rect_new(mattr.u.map, NULL))) {
@@ -1971,6 +2481,11 @@ gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm)
                                                wbm->prefix=g_malloc(len+2);
                                                strncpy(wbm->prefix, label_full, len+1);
                                                wbm->prefix[len+1]='\0';
+                                               if (!l[0]) {
+                                                       gui_internal_cmd_set_destination(this, wbm, wbm->name);
+                                                       found=1;
+                                                       break;
+                                               }
                                        } else {
                                                gui_internal_widget_destroy(this, wbm);
                                        }
@@ -1981,7 +2496,20 @@ gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm)
                }
                g_hash_table_destroy(hash);
        }
-       gui_internal_menu_render(this);
+       if (found)
+               gui_internal_check_exit(this);
+       else
+               gui_internal_menu_render(this);
+}
+
+static void
+gui_internal_cmd2_bookmarks(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
+{
+       char *str=NULL;
+       if (in && in[0] && ATTR_IS_STRING(in[0]->type)) {
+               str=in[0]->u.str;
+       }
+       gui_internal_cmd_bookmarks(this, NULL, str);
 }
 
 static void gui_internal_keypress_do(struct gui_priv *this, char *key)
@@ -1994,9 +2522,10 @@ static void gui_internal_keypress_do(struct gui_priv *this, char *key)
        wi=gui_internal_find_widget(menu, NULL, STATE_EDIT);
        if (wi) {
                if (*key == NAVIT_KEY_BACKSPACE) {
+                       dbg(0,"backspace\n");
                        if (wi->text && wi->text[0]) {
                                len=g_utf8_prev_char(wi->text+strlen(wi->text))-wi->text;
-                               wi->text[len]=' ';      
+                               wi->text[len]=' ';
                                text=g_strdup_printf("%s ", wi->text);
                        }
                } else {
@@ -2017,7 +2546,7 @@ static void gui_internal_keypress_do(struct gui_priv *this, char *key)
                }
                if (wi->func) {
                        wi->reason=2;
-                       wi->func(this, wi);
+                       wi->func(this, wi, wi->data);
                }
                gui_internal_widget_render(this, wi);
        }
@@ -2025,12 +2554,14 @@ static void gui_internal_keypress_do(struct gui_priv *this, char *key)
 
 
 static void
-gui_internal_cmd_keypress(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd_keypress(struct gui_priv *this, struct widget *wm, void *data)
 {
        struct menu_data *md=gui_internal_menu_data(this);
        gui_internal_keypress_do(this, (char *) wm->data);
-       if (md->keyboard_mode == 2) 
+       if (md->keyboard_mode == 2)
                gui_internal_keyboard_do(this, md->keyboard, 10);
+       if (md->keyboard_mode == 26)
+               gui_internal_keyboard_do(this, md->keyboard, 34);
 }
 
 static void
@@ -2052,43 +2583,113 @@ gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *se
        char *text=NULL,*name=NULL;
        struct search_list_result *res;
        struct widget *wc;
+       struct item *item=NULL;
        GList *l;
+       static char possible_keys[256]="";
 
        res=search_list_get_result(this->sl);
+       if (res) {
+               gchar* trunk_name = NULL;
+
+               struct widget *menu=g_list_last(this->root.children)->data;
+               struct widget *wi=gui_internal_find_widget(menu, NULL, STATE_EDIT);
+
+               if (! strcmp(wm_name,"Town"))
+                       trunk_name = g_strrstr(res->town->name, wi->text);
+               if (! strcmp(wm_name,"Street"))
+                       trunk_name = g_strrstr(name=res->street->name, wi->text);
+
+               if (trunk_name) {
+                       char next_char = trunk_name[strlen(wi->text)];
+                       int i;
+                       int len = strlen(possible_keys);
+                       for(i = 0; (i<len) && (possible_keys[i] != next_char) ;i++) ;
+                       if (i==len || !len) {
+                               possible_keys[len]=trunk_name[strlen(wi->text)];
+                               possible_keys[len+1]='\0';
+
+                       }
+                       dbg(1,"%s %s possible_keys:%s \n", wi->text, res->town->name, possible_keys);
+               }
+       }
+
        if (! res) {
                gui_internal_search_idle_end(this);
+
+               struct menu_data *md=gui_internal_menu_data(this);
+               if (md && md->keyboard && !(this->flags & 2048)) {
+                       GList *lk=md->keyboard->children;
+                       graphics_draw_mode(this->gra, draw_mode_begin);
+                       while (lk) {
+                               struct widget *child=lk->data;
+                               GList *lk2=child->children;
+                               while (lk2) {
+                                       struct widget *child_=lk2->data;
+                                       lk2=g_list_next(lk2);
+                                       if (child_->data && strcmp("\b", child_->data)) { // FIXME don't disable special keys
+                                               if (strlen(possible_keys) == 0)
+                                                       child_->state|= STATE_HIGHLIGHTED|STATE_VISIBLE|STATE_SENSITIVE|STATE_CLEAR ;
+                                               else if (g_strrstr(possible_keys, child_->data)!=NULL ) {
+                                                       child_->state|= STATE_HIGHLIGHTED|STATE_VISIBLE|STATE_SENSITIVE|STATE_CLEAR ;
+                                               } else {
+                                                       child_->state&= ~(STATE_HIGHLIGHTED|STATE_VISIBLE|STATE_SELECTED) ;
+                                               }
+                                               gui_internal_widget_render(this,child_);
+                                       }
+                               }
+                               lk=g_list_next(lk);
+                       }
+                       gui_internal_widget_render(this,md->keyboard);
+                       graphics_draw_mode(this->gra, draw_mode_end);
+               }
+
+               possible_keys[0]='\0';
                return;
        }
 
        if (! strcmp(wm_name,"Country")) {
                name=res->country->name;
+               item=&res->country->common.item;
                text=g_strdup_printf("%s", res->country->name);
        }
        if (! strcmp(wm_name,"Town")) {
+               char *postal=res->town->common.postal;
+               if (res->town->common.postal_mask)
+                       postal=res->town->common.postal_mask;
                name=res->town->name;
-               text=g_strdup(name);
+               item=&res->town->common.item;
+               if (res->town->name && res->town->district)
+                       text=g_strdup_printf("%s%s%s (%s)", postal ? postal : "", postal ? " ":"", res->town->name, res->town->district);
+               else
+                       text=g_strdup_printf("%s%s%s", postal ? postal : "", postal ? " ":"", res->town->name);
        }
        if (! strcmp(wm_name,"Street")) {
                name=res->street->name;
+               item=&res->street->common.item;
                text=g_strdup_printf("%s %s", res->town->name, res->street->name);
        }
-#if 0
-                       dbg(0,"res=%s\n", res->town->name);
-#endif
-       gui_internal_widget_append(search_list,
-               wc=gui_internal_button_new_with_callback(this, text,
-               image_new_xs(this, res->country->flag), gravity_left_center|orientation_horizontal|flags_fill,
-               gui_internal_cmd_position, param));
+       if (! strcmp(wm_name,"House number")) {
+               name=res->house_number->house_number;
+               text=g_strdup_printf("%s", name);
+       }
+       dbg(1,"res->country->flag=%s\n", res->country->flag);
+               gui_internal_widget_append(search_list,
+                               wc=gui_internal_button_new_with_callback(this, text,
+                                       image_new_xs(this, res->country->flag),
+                                       gravity_left_center|orientation_horizontal|flags_fill,
+                                       gui_internal_cmd_position, param));
+               wc->name=g_strdup(name);
+               if (res->c)
+                       wc->c=*res->c;
+               wc->selection_id=res->id;
+               if (item)
+                       wc->item=*item;
+               gui_internal_widget_pack(this, search_list);
+               l=g_list_last(this->root.children);
+               graphics_draw_mode(this->gra, draw_mode_begin);
+               gui_internal_widget_render(this, l->data);
+               graphics_draw_mode(this->gra, draw_mode_end);
        g_free(text);
-       wc->name=g_strdup(name);
-       if (res->c)
-               wc->c=*res->c;
-       wc->item.id_lo=res->id;
-       gui_internal_widget_pack(this, search_list);
-       l=g_list_last(this->root.children);
-       graphics_draw_mode(this->gra, draw_mode_begin);
-       gui_internal_widget_render(this, l->data);
-       graphics_draw_mode(this->gra, draw_mode_end);
 }
 
 static void
@@ -2100,18 +2701,27 @@ gui_internal_search_idle_start(struct gui_priv *this, char *wm_name, struct widg
 }
 
 
+/**
+ *
+ * @param wm The widget that generated the event for the search changed,
+ *        if this was generated by a key on the virtual keyboard then
+ *        wm is the key button widget.
+ */
 static void
-gui_internal_search_changed(struct gui_priv *this, struct widget *wm)
+gui_internal_search_changed(struct gui_priv *this, struct widget *wm, void *data)
 {
        GList *l;
        struct widget *search_list=gui_internal_menu_data(this)->search_list;
        gui_internal_widget_children_destroy(this, search_list);
+
        void *param=(void *)3;
        int minlen=1;
-       if (! strcmp(wm->name,"Country")) {
+       if (! strcmp(wm->name,"Country")) 
                param=(void *)4;
-               minlen=1;
-       }
+       if (! strcmp(wm->name,"Street")) 
+               param=(void *)5;
+       if (! strcmp(wm->name,"House number")) 
+               param=(void *)6;
        dbg(0,"%s now '%s'\n", wm->name, wm->text);
 
        gui_internal_search_idle_end(this);
@@ -2122,9 +2732,11 @@ gui_internal_search_changed(struct gui_priv *this, struct widget *wm)
                if (! strcmp(wm->name,"Country"))
                        search_attr.type=attr_country_all;
                if (! strcmp(wm->name,"Town"))
-                       search_attr.type=attr_town_name;
+                       search_attr.type=attr_town_or_district_name;
                if (! strcmp(wm->name,"Street"))
                        search_attr.type=attr_street_name;
+               if (! strcmp(wm->name,"House number"))
+                       search_attr.type=attr_house_number;
                search_attr.u.str=wm->text;
                search_list_search(this->sl, &search_attr, 1);
                gui_internal_search_idle_start(this, wm->name, search_list, param);
@@ -2134,7 +2746,7 @@ gui_internal_search_changed(struct gui_priv *this, struct widget *wm)
 }
 
 static struct widget *
-gui_internal_keyboard_key_data(struct gui_priv *this, struct widget *wkbd, char *text, void(*func)(struct gui_priv *priv, struct widget *widget), void *data, void (*data_free)(void *data), int w, int h)
+gui_internal_keyboard_key_data(struct gui_priv *this, struct widget *wkbd, char *text, void(*func)(struct gui_priv *priv, struct widget *widget, void *data), void *data, void (*data_free)(void *data), int w, int h)
 {
        struct widget *wk;
        gui_internal_widget_append(wkbd, wk=gui_internal_button_new_with_callback(this, text,
@@ -2143,7 +2755,7 @@ gui_internal_keyboard_key_data(struct gui_priv *this, struct widget *wkbd, char
        wk->background=this->background;
        wk->bl=w/2;
        wk->br=0;
-       wk->bt=h/2;
+       wk->bt=h/3;
        wk->bb=0;
        return wk;
 }
@@ -2154,14 +2766,18 @@ gui_internal_keyboard_key(struct gui_priv *this, struct widget *wkbd, char *text
        return gui_internal_keyboard_key_data(this, wkbd, text, gui_internal_cmd_keypress, g_strdup(key), g_free,w,h);
 }
 
-static void gui_internal_keyboard_change(struct gui_priv *this, struct widget *key);
+static void gui_internal_keyboard_change(struct gui_priv *this, struct widget *key, void *data);
 
+// Some macros that make the keyboard layout easier to visualise in
+// the source code. The macros are #undef'd after this function.
+#define KEY(x) gui_internal_keyboard_key(this, wkbd, (x), (x), max_w, max_h)
+#define SPACER() gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h)
 static struct widget *
 gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode)
 {
        struct widget *wkbd,*wk;
        struct menu_data *md=gui_internal_menu_data(this);
-       int i, max_w=navit_get_width(this->nav), max_h=navit_get_height(this->nav);
+       int i, max_w=this->root.w, max_h=this->root.h;
        int render=0;
 
        if (wkbdb) {
@@ -2185,15 +2801,15 @@ gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode)
        if (mode >= 0 && mode < 8) {
                for (i = 0 ; i < 26 ; i++) {
                        char text[]={'A'+i,'\0'};
-                       gui_internal_keyboard_key(this, wkbd, text, text,max_w,max_h);
+                       KEY(text);
                }
                gui_internal_keyboard_key(this, wkbd, "_"," ",max_w,max_h);
                if (mode == 0) {
-                       gui_internal_keyboard_key(this, wkbd, "-","-",max_w,max_h);
-                       gui_internal_keyboard_key(this, wkbd, "'","'",max_w,max_h);
-                       gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h);
+                       KEY("-");
+                       KEY("'");
+                       SPACER();
                } else {
-                       gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h);
+                       SPACER();
                        wk=gui_internal_keyboard_key_data(this, wkbd, "a", gui_internal_keyboard_change, wkbd, NULL,max_w,max_h);
                        wk->datai=mode+8;
                        wk=gui_internal_keyboard_key_data(this, wkbd, "1", gui_internal_keyboard_change, wkbd, NULL,max_w,max_h);
@@ -2206,15 +2822,15 @@ gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode)
        if (mode >= 8 && mode < 16) {
                for (i = 0 ; i < 26 ; i++) {
                        char text[]={'a'+i,'\0'};
-                       gui_internal_keyboard_key(this, wkbd, text, text,max_w,max_h);
+                       KEY(text);
                }
                gui_internal_keyboard_key(this, wkbd, "_"," ",max_w,max_h);
                if (mode == 8) {
-                       gui_internal_keyboard_key(this, wkbd, "-","-",max_w,max_h);
-                       gui_internal_keyboard_key(this, wkbd, "'","'",max_w,max_h);
-                       gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h);
+                       KEY("-");
+                       KEY("'");
+                       SPACER();
                } else {
-                       gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h);
+                       SPACER();
                        wk=gui_internal_keyboard_key_data(this, wkbd, "A", gui_internal_keyboard_change, wkbd, NULL,max_w,max_h);
                        wk->datai=mode-8;
                        wk=gui_internal_keyboard_key_data(this, wkbd, "1", gui_internal_keyboard_change, wkbd, NULL,max_w,max_h);
@@ -2227,29 +2843,19 @@ gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode)
        if (mode >= 16 && mode < 24) {
                for (i = 0 ; i < 10 ; i++) {
                        char text[]={'0'+i,'\0'};
-                       gui_internal_keyboard_key(this, wkbd, text, text,max_w,max_h);
-               }
-               gui_internal_keyboard_key(this, wkbd, ".",".",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "°","°",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "'","'",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "\"","\"",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "-","-",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "+","+",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "*","*",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "/","/",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "(","(",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, ")",")",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "=","=",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "?","?",max_w,max_h);
-               for (i = 0 ; i < 5 ; i++) {
-                       gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h);
+                       KEY(text);
                }
-               if (mode == 8) {
-                       gui_internal_keyboard_key(this, wkbd, "-","-",max_w,max_h);
-                       gui_internal_keyboard_key(this, wkbd, "'","'",max_w,max_h);
-                       gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h);
+               KEY("."); KEY("°"); KEY("'"); KEY("\""); KEY("-"); KEY("+");
+               KEY("*"); KEY("/"); KEY("("); KEY(")"); KEY("="); KEY("?");
+
+               for (i = 0 ; i < 5 ; i++) SPACER();
+
+               if (mode == 16) {
+                       KEY("-");
+                       KEY("'");
+                       SPACER();
                } else {
-                       gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h);
+                       SPACER();
                        wk=gui_internal_keyboard_key_data(this, wkbd, "A", gui_internal_keyboard_change, wkbd, NULL,max_w,max_h);
                        wk->datai=mode-16;
                        wk=gui_internal_keyboard_key_data(this, wkbd, "a", gui_internal_keyboard_change, wkbd, NULL,max_w,max_h);
@@ -2260,25 +2866,25 @@ gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode)
                gui_internal_keyboard_key(this, wkbd, "<-","\b",max_w,max_h);
        }
        if (mode >= 24 && mode < 32) {
-               gui_internal_keyboard_key(this, wkbd, "Ä","Ä",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "Ö","Ö",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "Ü","Ü",max_w,max_h);
-               for (i = 0 ; i < 27 ; i++) {
-                       gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h);
-               }
+               KEY("Ä"); KEY("Ë"); KEY("Ï"); KEY("Ö"); KEY("Ü"); KEY("Æ"); KEY("Ø"); KEY("Å");
+               KEY("Á"); KEY("É"); KEY("Í"); KEY("Ó"); KEY("Ú"); KEY("Š"); KEY("Č"); KEY("Ž");
+               KEY("À"); KEY("È"); KEY("Ì"); KEY("Ò"); KEY("Ù"); KEY("Ś"); KEY("Ć"); KEY("Ź");
+               KEY("Â"); KEY("Ê"); KEY("Î"); KEY("Ô"); KEY("Û"); SPACER();
+
                wk=gui_internal_keyboard_key_data(this, wkbd, "A",gui_internal_keyboard_change,wkbdb,NULL,max_w,max_h);
                wk->datai=mode-24;
+
                gui_internal_keyboard_key(this, wkbd, "<-","\b",max_w,max_h);
        }
        if (mode >= 32 && mode < 40) {
-               gui_internal_keyboard_key(this, wkbd, "ä","ä",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "ö","ö",max_w,max_h);
-               gui_internal_keyboard_key(this, wkbd, "ü","ü",max_w,max_h);
-               for (i = 0 ; i < 27 ; i++) {
-                       gui_internal_keyboard_key_data(this, wkbd, "", NULL, NULL, NULL,max_w,max_h);
-               }
+               KEY("ä"); KEY("ë"); KEY("ï"); KEY("ö"); KEY("ü"); KEY("æ"); KEY("ø"); KEY("å");
+               KEY("á"); KEY("é"); KEY("í"); KEY("ó"); KEY("ú"); KEY("š"); KEY("č"); KEY("ž");
+               KEY("à"); KEY("è"); KEY("ì"); KEY("ò"); KEY("ù"); KEY("ś"); KEY("ć"); KEY("ź");
+               KEY("â"); KEY("ê"); KEY("î"); KEY("ô"); KEY("û"); KEY("ß");
+
                wk=gui_internal_keyboard_key_data(this, wkbd, "a",gui_internal_keyboard_change,wkbdb,NULL,max_w,max_h);
                wk->datai=mode-24;
+
                gui_internal_keyboard_key(this, wkbd, "<-","\b",max_w,max_h);
        }
        gui_internal_widget_append(wkbdb, wkbd);
@@ -2288,15 +2894,19 @@ gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode)
        }
        return wkbdb;
 }
+#undef KEY
+#undef SPACER
 
 static struct widget *
 gui_internal_keyboard(struct gui_priv *this, int mode)
 {
+       if (! this->keyboard)
+               return NULL;
        return gui_internal_keyboard_do(this, NULL, mode);
 }
 
 static void
-gui_internal_keyboard_change(struct gui_priv *this, struct widget *key)
+gui_internal_keyboard_change(struct gui_priv *this, struct widget *key, void *data)
 {
        gui_internal_keyboard_do(this, key->data, key->datai);
 }
@@ -2312,7 +2922,7 @@ gui_internal_search_list_set_default_country(struct gui_priv *this)
 
        country_attr=country_default();
        tracking=navit_get_tracking(this->nav);
-       if (tracking && tracking_get_current_attr(tracking, attr_country_id, &search_attr))
+       if (tracking && tracking_get_attr(tracking, attr_country_id, &search_attr, NULL))
                country_attr=&search_attr;
        if (country_attr) {
                cs=country_search_new(country_attr, 0);
@@ -2324,12 +2934,19 @@ gui_internal_search_list_set_default_country(struct gui_priv *this)
                        search_list_search(this->sl, &search_attr, 0);
                        while((res=search_list_get_result(this->sl)));
                        g_free(this->country_iso2);
-                       if (item_attr_get(item, attr_country_iso2, &country_iso2)) 
+                       if (item_attr_get(item, attr_country_iso2, &country_iso2))
                                this->country_iso2=g_strdup(country_iso2.u.str);
                }
                country_search_destroy(cs);
        } else {
                dbg(0,"warning: no default country found\n");
+               if (this->country_iso2) {
+                   dbg(0,"attempting to use country '%s'\n",this->country_iso2);
+                   search_attr.type=attr_country_iso2;
+                   search_attr.u.str=this->country_iso2;
+            search_list_search(this->sl, &search_attr, 0);
+            while((res=search_list_get_result(this->sl)));
+               }
        }
 }
 
@@ -2358,6 +2975,7 @@ gui_internal_search(struct gui_priv *this, char *what, char *type, int flags)
 {
        struct widget *wb,*wk,*w,*wr,*we,*wl,*wnext=NULL;
        char *country;
+       int keyboard_mode=2;
        gui_internal_search_list_new(this);
        wb=gui_internal_menu(this, what);
        w=gui_internal_box_new(this, gravity_center|orientation_vertical|flags_expand|flags_fill);
@@ -2371,9 +2989,15 @@ gui_internal_search(struct gui_priv *this, char *what, char *type, int flags)
                wnext=gui_internal_image_new(this, image_new_xs(this, "gui_select_town"));
                wnext->func=gui_internal_search_town;
        } else if (!strcmp(type,"Town")) {
-               if (this->country_iso2)
+               if (this->country_iso2) {
+#if HAVE_API_ANDROID
+                       char country_iso2[strlen(this->country_iso2)+1];
+                       strtolower(country_iso2, this->country_iso2);
+                       country=g_strdup_printf("country_%s", country_iso2);
+#else
                        country=g_strdup_printf("country_%s", this->country_iso2);
-               else
+#endif
+               } else
                        country=strdup("gui_select_country");
                gui_internal_widget_append(we, wb=gui_internal_image_new(this, image_new_xs(this, country)));
                wb->state |= STATE_SENSITIVE;
@@ -2388,6 +3012,13 @@ gui_internal_search(struct gui_priv *this, char *what, char *type, int flags)
                gui_internal_widget_append(we, wb=gui_internal_image_new(this, image_new_xs(this, "gui_select_town")));
                wb->state |= STATE_SENSITIVE;
                wb->func = gui_internal_back;
+               wnext=gui_internal_image_new(this, image_new_xs(this, "gui_select_house_number"));
+               wnext->func=gui_internal_search_house_number;
+       } else if (!strcmp(type,"House number")) {
+               gui_internal_widget_append(we, wb=gui_internal_image_new(this, image_new_xs(this, "gui_select_street")));
+               wb->state |= STATE_SENSITIVE;
+               wb->func = gui_internal_back;
+               keyboard_mode=18;
        }
        gui_internal_widget_append(we, wk=gui_internal_label_new(this, NULL));
        if (wnext) {
@@ -2403,28 +3034,44 @@ gui_internal_search(struct gui_priv *this, char *what, char *type, int flags)
        wk->func = gui_internal_search_changed;
        wk->name=g_strdup(type);
        if (this->keyboard)
-               gui_internal_widget_append(w, gui_internal_keyboard(this,0));
+               gui_internal_widget_append(w, gui_internal_keyboard(this,keyboard_mode));
        gui_internal_menu_render(this);
 }
 
 static void
-gui_internal_search_street(struct gui_priv *this, struct widget *widget)
+gui_internal_search_house_number(struct gui_priv *this, struct widget *widget, void *data)
+{
+       search_list_select(this->sl, attr_street_name, 0, 0);
+       gui_internal_search(this,_("House number"),"House number",0);
+}
+
+static void
+gui_internal_search_house_number_in_street(struct gui_priv *this, struct widget *widget, void *data)
+{
+       dbg(0,"id %d\n", widget->selection_id);
+       search_list_select(this->sl, attr_street_name, 0, 0);
+       search_list_select(this->sl, attr_street_name, widget->selection_id, 1);
+       gui_internal_search(this,_("House number"),"House number",0);
+}
+
+static void
+gui_internal_search_street(struct gui_priv *this, struct widget *widget, void *data)
 {
-       search_list_select(this->sl, attr_town_name, 0, 0);
+       search_list_select(this->sl, attr_town_or_district_name, 0, 0);
        gui_internal_search(this,_("Street"),"Street",0);
 }
 
 static void
-gui_internal_search_street_in_town(struct gui_priv *this, struct widget *widget)
+gui_internal_search_street_in_town(struct gui_priv *this, struct widget *widget, void *data)
 {
-       dbg(0,"id %d\n", widget->item.id_lo);
-       search_list_select(this->sl, attr_town_name, 0, 0);
-       search_list_select(this->sl, attr_town_name, widget->item.id_lo, 1);
+       dbg(0,"id %d\n", widget->selection_id);
+       search_list_select(this->sl, attr_town_or_district_name, 0, 0);
+       search_list_select(this->sl, attr_town_or_district_name, widget->selection_id, 1);
        gui_internal_search(this,_("Street"),"Street",0);
 }
 
 static void
-gui_internal_search_town(struct gui_priv *this, struct widget *wm)
+gui_internal_search_town(struct gui_priv *this, struct widget *wm, void *data)
 {
        if (this->sl)
                search_list_select(this->sl, attr_country_all, 0, 0);
@@ -2437,9 +3084,9 @@ static void
 gui_internal_search_town_in_country(struct gui_priv *this, struct widget *widget)
 {
        struct search_list_common *slc;
-       dbg(0,"id %d\n", widget->item.id_lo);
+       dbg(0,"id %d\n", widget->selection_id);
        search_list_select(this->sl, attr_country_all, 0, 0);
-       slc=search_list_select(this->sl, attr_country_all, widget->item.id_lo, 1);
+       slc=search_list_select(this->sl, attr_country_all, widget->selection_id, 1);
        if (slc) {
                g_free(this->country_iso2);
                this->country_iso2=((struct search_list_country *)slc)->iso2;
@@ -2448,14 +3095,14 @@ gui_internal_search_town_in_country(struct gui_priv *this, struct widget *widget
 }
 
 static void
-gui_internal_search_country(struct gui_priv *this, struct widget *widget)
+gui_internal_search_country(struct gui_priv *this, struct widget *widget, void *data)
 {
        gui_internal_prune_menu_count(this, 1, 0);
        gui_internal_search(this,_("Country"),"Country",0);
 }
 
 static void
-gui_internal_cmd_town(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd2_town(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
        if (this->sl)
                search_list_select(this->sl, attr_country_all, 0, 0);
@@ -2463,7 +3110,7 @@ gui_internal_cmd_town(struct gui_priv *this, struct widget *wm)
 }
 
 static void
-gui_internal_cmd_layout(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd2_setting_layout(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
        struct attr attr;
        struct widget *w,*wb,*wl;
@@ -2485,132 +3132,31 @@ gui_internal_cmd_layout(struct gui_priv *this, struct widget *wm)
 }
 
 static void
-gui_internal_cmd_fullscreen(struct gui_priv *this, struct widget *wm)
-{
-       this->fullscreen=!this->fullscreen;
-       this->win->fullscreen(this->win, this->fullscreen);
-}
-
-static void
-gui_internal_cmd_2d(struct gui_priv *this, struct widget *wm)
-{
-       struct transformation *trans=navit_get_trans(this->nav);
-       transform_set_pitch(trans, 0);
-       this->redraw=1;
-}
-
-static void
-gui_internal_cmd_3d(struct gui_priv *this, struct widget *wm)
-{
-       struct transformation *trans=navit_get_trans(this->nav);
-       transform_set_pitch(trans, 20);
-       this->redraw=1;
-}
-
-static void
-gui_internal_cmd_display(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
-       struct widget *w;
-       struct transformation *trans;
-
-       w=gui_internal_menu(this, _("Display"));        
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Layout"),
-                       image_new_l(this, "gui_display"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_layout, NULL));
-       if (this->fullscreen) {
-               gui_internal_widget_append(w,
-                       gui_internal_button_new_with_callback(this, _("Window Mode"),
-                               image_new_l(this, "gui_leave_fullscreen"), gravity_center|orientation_vertical,
-                               gui_internal_cmd_fullscreen, NULL));
-       } else {
-               gui_internal_widget_append(w,
-                       gui_internal_button_new_with_callback(this, _("Fullscreen"),
-                               image_new_l(this, "gui_fullscreen"), gravity_center|orientation_vertical,
-                               gui_internal_cmd_fullscreen, NULL));
-       }
-       trans=navit_get_trans(this->nav);
-       if (transform_get_pitch(trans)) {
-               gui_internal_widget_append(w,
-                       gui_internal_button_new_with_callback(this, _("2D"),
-                               image_new_l(this, "gui_map"), gravity_center|orientation_vertical,
-                               gui_internal_cmd_2d, NULL));
-               
-       } else {
-               gui_internal_widget_append(w,
-                       gui_internal_button_new_with_callback(this, _("3D"),
-                               image_new_l(this, "gui_map"), gravity_center|orientation_vertical,
-                               gui_internal_cmd_3d, NULL));
-       }
-       gui_internal_menu_render(this);
+       struct attr navit;
+       navit.type=attr_navit;
+       navit.u.navit=this->nav;
+       navit_destroy(navit.u.navit);
+       config_remove_attr(config, &navit);
+       event_main_loop_quit();
 }
 
 static void
-gui_internal_cmd_quit(struct gui_priv *this, struct widget *wm)
+gui_internal_window_closed(struct gui_priv *this)
 {
-       struct navit *nav=this->nav;
-       navit_destroy(nav);
-       main_remove_navit(nav);
+       gui_internal_cmd2_quit(this, NULL, NULL, NULL, NULL);
 }
 
 static void
-gui_internal_cmd_abort_navigation(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd2_abort_navigation(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
-       navit_set_destination(this->nav, NULL, NULL);
+       navit_set_destination(this->nav, NULL, NULL, 0);
 }
 
 
 static void
-gui_internal_cmd_actions(struct gui_priv *this, struct widget *wm)
-{
-       struct widget *w,*wc;
-       char *coord;
-
-       w=gui_internal_menu(this, _("Actions"));        
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Bookmarks"),
-                       image_new_l(this, "gui_bookmark"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_bookmarks, NULL));
-       if (this->clickp_valid) {
-               coord=coordinates(&this->clickp, '\n');
-               gui_internal_widget_append(w,
-                       wc=gui_internal_button_new_with_callback(this, coord,
-                               image_new_l(this, "gui_map"), gravity_center|orientation_vertical,
-                               gui_internal_cmd_position, (void *)1));
-               wc->name=g_strdup(_("Map Point"));
-               wc->c=this->clickp;
-               g_free(coord);
-       }
-       if (this->vehicle_valid) {
-               coord=coordinates(&this->vehiclep, '\n');
-               gui_internal_widget_append(w,
-                       wc=gui_internal_button_new_with_callback(this, coord,
-                               image_new_l(this, "gui_vehicle"), gravity_center|orientation_vertical,
-                               gui_internal_cmd_position, NULL));
-               wc->name=g_strdup(_("Vehicle Position"));
-               wc->c=this->vehiclep;
-               g_free(coord);
-       }
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Town"),
-                       image_new_l(this, "gui_town"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_town, NULL));
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Quit"),
-                       image_new_l(this, "gui_quit"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_quit, NULL));
-       
-       if (navit_check_route(this->nav)) {
-               gui_internal_widget_append(w,
-                                                                  gui_internal_button_new_with_callback(this, _("Stop\nNavigation"),
-                                                                image_new_l(this, "gui_stop"), gravity_center|orientation_vertical,
-                                                                gui_internal_cmd_abort_navigation, NULL));
-       }
-       gui_internal_menu_render(this);
-}
-
-static void
-gui_internal_cmd_maps(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
        struct attr attr, on, off, description, type, data;
        struct widget *w,*wb,*wma;
@@ -2643,26 +3189,282 @@ gui_internal_cmd_maps(struct gui_priv *this, struct widget *wm)
        }
        navit_attr_iter_destroy(iter);
        gui_internal_menu_render(this);
-       
+
+}
+static void
+gui_internal_cmd_set_active_vehicle(struct gui_priv *this, struct widget *wm, void *data)
+{
+       struct attr vehicle = {attr_vehicle,{wm->data}};
+       navit_set_attr(this->nav, &vehicle);
+}
+
+static void
+gui_internal_cmd_show_satellite_status(struct gui_priv *this, struct widget *wm, void *data)
+{
+       struct widget *w,*wb,*row;
+       struct attr attr,sat_attr;
+       struct vehicle *v=wm->data;
+       char *str;
+       int i;
+       enum attr_type types[]={attr_sat_prn, attr_sat_elevation, attr_sat_azimuth, attr_sat_snr};
+
+       wb=gui_internal_menu(this, _("Show Satellite Status"));
+       gui_internal_menu_data(this)->redisplay=gui_internal_cmd_show_satellite_status;
+       gui_internal_menu_data(this)->redisplay_widget=wm;
+       w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
+       gui_internal_widget_append(wb, w);
+       w = gui_internal_widget_table_new(this,gravity_center | orientation_vertical | flags_expand | flags_fill, 0);
+       row = gui_internal_widget_table_row_new(this,gravity_left_top);
+       gui_internal_widget_append(row, gui_internal_label_new(this, _(" PRN ")));
+       gui_internal_widget_append(row, gui_internal_label_new(this, _(" Elevation ")));
+       gui_internal_widget_append(row, gui_internal_label_new(this, _(" Azimuth ")));
+       gui_internal_widget_append(row, gui_internal_label_new(this, _(" SNR ")));
+       gui_internal_widget_append(w,row);
+       while (vehicle_get_attr(v, attr_position_sat_item, &attr, NULL)) {
+               row = gui_internal_widget_table_row_new(this,gravity_left_top);
+               for (i = 0 ; i < sizeof(types)/sizeof(enum attr_type) ; i++) {
+                       if (item_attr_get(attr.u.item, types[i], &sat_attr))
+                               str=g_strdup_printf("%d", sat_attr.u.num);
+                       else
+                               str=g_strdup("");
+                       gui_internal_widget_append(row, gui_internal_label_new(this, str));
+                       g_free(str);
+               }
+               gui_internal_widget_append(w,row);
+       }
+       gui_internal_widget_append(wb, w);
+       gui_internal_menu_render(this);
+}
+
+static void
+gui_internal_cmd_show_nmea_data(struct gui_priv *this, struct widget *wm, void *data)
+{
+       struct widget *w,*wb;
+       struct attr attr;
+       struct vehicle *v=wm->data;
+       wb=gui_internal_menu(this, _("Show NMEA Data"));
+       gui_internal_menu_data(this)->redisplay=gui_internal_cmd_show_nmea_data;
+       gui_internal_menu_data(this)->redisplay_widget=wm;
+       w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
+       gui_internal_widget_append(wb, w);
+       if (vehicle_get_attr(v, attr_position_nmea, &attr, NULL))
+               gui_internal_widget_append(w, gui_internal_text_new(this, attr.u.str, gravity_left_center|orientation_vertical));
+       gui_internal_menu_render(this);
+}
+
+/**
+ * A container to hold the selected vehicle and the desired profile in
+ * one data item.
+ */
+struct vehicle_and_profilename {
+       struct vehicle *vehicle;
+       char *profilename;
+};
+
+/**
+ * Figures out whether the given vehicle is the active vehicle.
+ *
+ * @return true if the vehicle is active, false otherwise.
+ */
+static int
+gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle
+        *vehicle)
+{
+       struct attr active_vehicle;
+
+       if (!navit_get_attr(this->nav, attr_vehicle, &active_vehicle, NULL))
+        active_vehicle.u.vehicle=NULL;
+
+       return active_vehicle.u.vehicle == vehicle;
+}
+
+static void
+save_vehicle_xml(struct vehicle *v)
+{
+       struct attr attr;
+       struct attr_iter *iter=vehicle_attr_iter_new();
+       int childs=0;
+       dbg(0,"enter\n");
+       printf("<vehicle");
+       while (vehicle_get_attr(v, attr_any_xml, &attr, iter)) {
+               if (ATTR_IS_OBJECT(attr.type))
+                       childs=1;
+               else
+                       printf(" %s=\"%s\"",attr_to_name(attr.type),attr_to_text(&attr, NULL, 1));
+       }
+       if (childs) {
+               printf(">\n");
+               printf("</vehicle>\n");
+       } else
+               printf(" />\n");
+       vehicle_attr_iter_destroy(iter);
+}
+
+
+/**
+ * Reacts to a button press that changes a vehicle's active profile.
+ *
+ * @see gui_internal_add_vehicle_profile
+ */
+static void
+gui_internal_cmd_set_active_profile(struct gui_priv *this, struct
+               widget *wm, void *data)
+{
+       struct vehicle_and_profilename *vapn = data;
+       struct vehicle *v = vapn->vehicle;
+       char *profilename = vapn->profilename;
+       struct attr vehicle_name_attr;
+       char *vehicle_name = NULL;
+
+       // Get the vehicle name
+       vehicle_get_attr(v, attr_name, &vehicle_name_attr, NULL);
+       vehicle_name = vehicle_name_attr.u.str;
+
+       dbg(0, "Changing vehicle %s to profile %s\n", vehicle_name,
+                       profilename);
+
+       // Change the profile name
+       struct attr profilename_attr = {attr_profilename, {profilename}};
+       if(!vehicle_set_attr(v, &profilename_attr)) {
+               dbg(0, "Unable to set the vehicle's profile name\n");
+       }
+
+    // Notify Navit that the routing should be re-done if this is the
+    // active vehicle.
+       if (gui_internal_is_active_vehicle(this, v)) {
+               struct attr vehicle;
+               vehicle.type=attr_vehicle;
+               vehicle.u.vehicle=v;
+               navit_set_attr(this->nav, &vehicle);
+       }
+       save_vehicle_xml(v);
+}
+
+/**
+ * Adds the vehicle profile to the GUI, allowing the user to pick a
+ * profile for the currently selected vehicle.
+ */
+static void
+gui_internal_add_vehicle_profile(struct gui_priv *this, struct widget
+               *parent, struct vehicle *v, struct vehicleprofile *profile)
+{
+       // Just here to show up in the translation file, nice and close to
+       // where the translations are actually used.
+       struct attr profile_attr;
+       struct attr *attr = NULL;
+       char *name = NULL;
+       char *active_profile = NULL;
+       char *label = NULL;
+       int active;
+       struct vehicle_and_profilename *context = NULL;
+
+#ifdef ONLY_FOR_TRANSLATION
+       char *translations[] = {_n("car"), _n("bike"), _n("pedestrian")};
+#endif
+
+       // Figure out the profile name
+       attr = attr_search(profile->attrs, NULL, attr_name);
+       name = attr->u.str;
+
+       // Determine whether the profile is the active one
+       vehicle_get_attr(v, attr_profilename, &profile_attr, NULL);
+       active_profile = profile_attr.u.str;
+       active = strcmp(name, active_profile) == 0;
+
+       dbg(0, "Adding vehicle profile %s, active=%s/%i\n", name,
+                       active_profile, active);
+
+       // Build a translatable label.
+       if(active) {
+               label = g_strdup_printf(_("Current profile: %s"), _(name));
+       } else {
+               label = g_strdup_printf(_("Change profile to: %s"), _(name));
+       }
+
+       // Create the context object (the vehicle and the desired profile)
+       context = g_new0(struct vehicle_and_profilename, 1);
+       context->vehicle = v;
+       context->profilename = name;
+
+       // Add the button
+       gui_internal_widget_append(parent,
+               gui_internal_button_new_with_callback(
+                       this, label,
+                       image_new_xs(this, active ? "gui_active" : "gui_inactive"),
+                       gravity_left_center|orientation_horizontal|flags_fill,
+                       gui_internal_cmd_set_active_profile, context));
+
+       free(label);
+}
+
+static void
+gui_internal_cmd_vehicle_settings(struct gui_priv *this, struct widget *wm, void *data)
+{
+       struct widget *w,*wb;
+       struct attr attr;
+       struct vehicle *v=wm->data;
+    struct vehicleprofile *profile = NULL;
+
+       wb=gui_internal_menu(this, wm->text);
+       w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
+       gui_internal_widget_append(wb, w);
+
+    // Add the "Set as active" button if this isn't the active
+    // vehicle.
+       if (!gui_internal_is_active_vehicle(this, v)) {
+               gui_internal_widget_append(w,
+                       gui_internal_button_new_with_callback(this, _("Set as active"),
+                               image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
+                               gui_internal_cmd_set_active_vehicle, wm->data));
+       }
+
+       if (vehicle_get_attr(v, attr_position_sat_item, &attr, NULL)) {
+               gui_internal_widget_append(w,
+                       gui_internal_button_new_with_callback(this, _("Show Satellite status"),
+                               image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
+                               gui_internal_cmd_show_satellite_status, wm->data));
+       }
+       if (vehicle_get_attr(v, attr_position_nmea, &attr, NULL)) {
+               gui_internal_widget_append(w,
+                       gui_internal_button_new_with_callback(this, _("Show NMEA data"),
+                               image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
+                               gui_internal_cmd_show_nmea_data, wm->data));
+       }
+
+    // Add all the possible vehicle profiles to the menu
+       GList *profiles = navit_get_vehicleprofiles(this->nav);
+    while(profiles) {
+        profile = (struct vehicleprofile *)profiles->data;
+        gui_internal_add_vehicle_profile(this, w, v, profile);
+               profiles = g_list_next(profiles);
+    }
+
+       callback_list_call_attr_2(this->cbl, attr_vehicle, w, wm->data);
+       gui_internal_menu_render(this);
 }
 
 static void
-gui_internal_cmd_vehicle(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
        struct attr attr,vattr;
        struct widget *w,*wb,*wl;
        struct attr_iter *iter;
+       struct attr active_vehicle;
 
 
        wb=gui_internal_menu(this, _("Vehicle"));
        w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
        w->spy=this->spacing*3;
        gui_internal_widget_append(wb, w);
+       if (!navit_get_attr(this->nav, attr_vehicle, &active_vehicle, NULL))
+               active_vehicle.u.vehicle=NULL;
        iter=navit_attr_iter_new();
        while(navit_get_attr(this->nav, attr_vehicle, &attr, iter)) {
                vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
-               wl=gui_internal_button_navit_attr_new(this, vattr.u.str, gravity_left_center|orientation_horizontal|flags_fill,
-                       &attr, NULL);
+               wl=gui_internal_button_new_with_callback(this, vattr.u.str,
+                       image_new_l(this, attr.u.vehicle == active_vehicle.u.vehicle ? "gui_active" : "gui_inactive"), gravity_left_center|orientation_horizontal|flags_fill,
+                       gui_internal_cmd_vehicle_settings, attr.u.vehicle);
+               wl->text=g_strdup(vattr.u.str);
                gui_internal_widget_append(w, wl);
        }
        navit_attr_iter_destroy(iter);
@@ -2671,7 +3473,7 @@ gui_internal_cmd_vehicle(struct gui_priv *this, struct widget *wm)
 
 
 static void
-gui_internal_cmd_rules(struct gui_priv *this, struct widget *wm)
+gui_internal_cmd2_setting_rules(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
        struct widget *wb,*w;
        struct attr on,off;
@@ -2693,41 +3495,16 @@ gui_internal_cmd_rules(struct gui_priv *this, struct widget *wm)
                        &on, &off));
        on.u.num=1;
        off.u.num=0;
-       on.type=off.type=attr_cursor;
+       on.type=off.type=attr_follow_cursor;
        gui_internal_widget_append(w,
                gui_internal_button_navit_attr_new(this, _("Map follows Vehicle"), gravity_left_center|orientation_horizontal|flags_fill,
                        &on, &off));
        gui_internal_menu_render(this);
 }
 
-static void
-gui_internal_cmd_settings(struct gui_priv *this, struct widget *wm)
-{
-       struct widget *w;
-
-       w=gui_internal_menu(this, _("Settings"));       
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Display"),
-                       image_new_l(this, "gui_display"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_display, NULL));
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Maps"),
-                       image_new_l(this, "gui_maps"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_maps, NULL));
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Vehicle"),
-                       image_new_l(this, "gui_vehicle"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_vehicle, NULL));
-       gui_internal_widget_append(w,
-               gui_internal_button_new_with_callback(this, _("Rules"),
-                       image_new_l(this, "gui_rules"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_rules, NULL));
-       gui_internal_menu_render(this);
-}
-
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 static void gui_internal_motion(void *data, struct point *p)
@@ -2747,70 +3524,342 @@ static void gui_internal_motion(void *data, struct point *p)
                this->motion_timeout_event=event_add_timeout(100,0, this->motion_timeout_callback);
 }
 
-
-static void gui_internal_menu_root(struct gui_priv *this)
+static const char *
+find_attr(const char **names, const char **values, const char *name)
 {
-       struct widget *w;
+       while (*names) {
+               if (!strcasecmp(*names, name))
+                       return *values;
+               names+=xml_attr_distance;
+               values+=xml_attr_distance;
+       }
+       return NULL;
+}
+
+static char *
+find_attr_dup(const char **names, const char **values, const char *name)
+{
+       return g_strdup(find_attr(names, values, name));
+}
+
+static void
+gui_internal_evaluate(struct gui_priv *this, const char *command)
+{
+       if (command)
+               command_evaluate(&this->self, command);
+}
+
+
+static void
+gui_internal_html_command(struct gui_priv *this, struct widget *w, void *data)
+{
+       gui_internal_evaluate(this,w->command);
+}
+
+static void
+gui_internal_html_href(struct gui_priv *this, struct widget *w, void *data)
+{
+       if (w->command && w->command[0] == '#') {
+               dbg(1,"href=%s\n",w->command);
+               gui_internal_html_menu(this, this->html_text, w->command+1);
+       }
+}
+
+
+static void
+gui_internal_html_start(void *dummy, const char *tag_name, const char **names, const char **values, void *data, void *error)
+{
+       struct gui_priv *this=data;
+       int i;
+       enum html_tag tag=html_tag_none;
+       struct html *html=&this->html[this->html_depth];
+       const char *src, *cond;
+
+       if (!strcasecmp(tag_name,"text"))
+               return;
+       html->command=NULL;
+       html->name=NULL;
+       html->href=NULL;
+       html->skip=0;
+       cond=find_attr(names, values, "cond");
+       
+       if (cond && !this->html_skip) {
+               if (!command_evaluate_to_boolean(&this->self, cond, NULL)) 
+                       html->skip=1;
+       }
+
+       for (i=0 ; i < sizeof(html_tag_map)/sizeof(struct html_tag_map); i++) {
+               if (!strcasecmp(html_tag_map[i].tag_name, tag_name)) {
+                       tag=html_tag_map[i].tag;
+                       break;
+               }
+       }
+       html->tag=tag;
+       if (!this->html_skip && !html->skip) {
+               switch (tag) {
+               case html_tag_a:
+                       html->name=find_attr_dup(names, values, "name");
+                       if (html->name) {
+                               html->skip=this->html_anchor ? strcmp(html->name,this->html_anchor) : 0;
+                               if (!html->skip)
+                                       this->html_anchor_found=1;
+                       }
+                       html->href=find_attr_dup(names, values, "href");
+                       break;
+               case html_tag_img:
+                       html->command=find_attr_dup(names, values, "onclick");
+                       src=find_attr(names, values, "src");
+                       if (src)
+                               html->w=gui_internal_image_new(this, image_new_l(this, src));
+                       break;
+               default:
+                       break;
+               }
+       }
+       this->html_skip+=html->skip;
+       this->html_depth++;
+}
+
+static void
+gui_internal_html_end(void *dummy, const char *tag_name, void *data, void *error)
+{
+       struct gui_priv *this=data;
+       struct html *html;
+       struct html *parent=NULL;
+
+       if (!strcasecmp(tag_name,"text"))
+               return;
+       this->html_depth--;
+       html=&this->html[this->html_depth];
+       if (this->html_depth > 0)
+               parent=&this->html[this->html_depth-1];
+       
+
+       if (!this->html_skip) { 
+               if (html->command && html->w) {
+                       html->w->state |= STATE_SENSITIVE;
+                       html->w->command=html->command;
+                       html->w->func=gui_internal_html_command;
+                       html->command=NULL;
+               }
+               if (parent && parent->href && html->w) {
+                       html->w->state |= STATE_SENSITIVE;
+                       html->w->command=g_strdup(parent->href);
+                       html->w->func=gui_internal_html_href;
+               }
+               switch (html->tag) {
+               case html_tag_img:
+                       gui_internal_widget_append(this->html_container, html->w);
+                       break;
+               default:
+                       break;
+               }
+       }
+       this->html_skip-=html->skip;
+       g_free(html->command);
+       g_free(html->name);
+       g_free(html->href);
+}
+
+static void
+gui_internal_html_text(void *dummy, const char *text, int len, void *data, void *error)
+{
+       struct gui_priv *this=data;
+       struct widget *w;
+       int depth=this->html_depth-1;
+       struct html *html=&this->html[depth];
+       char *text_stripped;
+
+       if (this->html_skip)
+               return;
+       while (isspace(text[0])) {
+               text++;
+               len--;
+       }
+       while (len > 0 && isspace(text[len-1]))
+               len--;
+       text_stripped=g_malloc(len+1);
+       strncpy(text_stripped, text, len);
+       text_stripped[len]='\0';
+       if (html->tag == html_tag_html && depth > 2) {
+               if (this->html[depth-1].tag == html_tag_script) {
+                       html=&this->html[depth-2];
+               }
+       }
+       switch (html->tag) {
+       case html_tag_a:
+               if (html->name && len) {
+                       this->html_container=gui_internal_menu(this, gettext(text_stripped));
+                       this->html_container->spx=this->spacing*10;
+               }
+               break;
+       case html_tag_h1:
+               if (!this->html_container) {
+                       this->html_container=gui_internal_menu(this, gettext(text_stripped));
+                       this->html_container->spx=this->spacing*10;
+               }
+               break;
+       case html_tag_img:
+               if (len) {
+                       w=gui_internal_box_new(this, gravity_center|orientation_vertical);
+                       gui_internal_widget_append(w, html->w);
+                       gui_internal_widget_append(w, gui_internal_text_new(this, gettext(text_stripped), gravity_center|orientation_vertical));
+                       html->w=w;
+               }
+               break;
+       case html_tag_script:
+               dbg(1,"execute %s\n",text_stripped);
+               gui_internal_evaluate(this,text_stripped);
+               break;
+       default:
+               break;
+       }
+}
 
+static void
+gui_internal_html_menu(struct gui_priv *this, const char *document, char *anchor)
+{
        graphics_draw_mode(this->gra, draw_mode_begin);
-       w=gui_internal_menu(this, _("Main menu"));
-       w->spx=this->spacing*10;
-       gui_internal_widget_append(w, gui_internal_button_new_with_callback(this, _("Actions"),
-                       image_new_l(this, "gui_actions"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_actions, NULL));
-       gui_internal_widget_append(w, gui_internal_button_new_with_callback(this, _("Settings"),
-                       image_new_l(this, "gui_settings"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_settings, NULL));
-       gui_internal_widget_append(w, gui_internal_button_new(this, _("Tools"),
-                       image_new_l(this, "gui_tools"), gravity_center|orientation_vertical));
-#if 0 
-       gui_internal_widget_append(w, gui_internal_button_new_with_callback(this, "Table Test",
-                       image_new_l(this, "gui_settings"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_route, NULL));
-#endif
-                                                             
+       this->html_container=NULL;
+       this->html_depth=0;
+       this->html_anchor=anchor;
+       this->html_anchor_found=0;
+       xml_parse_text(document, this, gui_internal_html_start, gui_internal_html_end, gui_internal_html_text);
        gui_internal_menu_render(this);
        graphics_draw_mode(this->gra, draw_mode_end);
 }
 
+
+static void gui_internal_menu_root(struct gui_priv *this)
+{
+       gui_internal_html_menu(this, this->html_text, "Main Menu");
+}
+
 static void
-gui_internal_cmd_menu(struct gui_priv *this, struct point *p, int ignore)
+gui_internal_enter(struct gui_priv *this, int ignore)
 {
        struct graphics *gra=this->gra;
-       struct transformation *trans;
-       struct coord c;
-       struct attr attr,attrp;
-
        this->ignore_button=ignore;
        this->clickp_valid=this->vehicle_valid=0;
 
        navit_block(this->nav, 1);
        graphics_overlay_disable(gra, 1);
+       this->root.p.x=0;
+       this->root.p.y=0;
+       this->root.background=this->background;
+}
+
+static void
+gui_internal_leave(struct gui_priv *this)
+{
+       graphics_draw_mode(this->gra, draw_mode_end);
+}
+
+static void
+gui_internal_cmd_menu(struct gui_priv *this, struct point *p, int ignore)
+{
+       struct transformation *trans;
+       struct coord c;
+       struct coord_geo g;
+       struct attr attr,attrp;
+
+       dbg(1,"enter\n");
+       gui_internal_enter(this, ignore);
        trans=navit_get_trans(this->nav);
+       attr_free(this->click_coord_geo);
+       this->click_coord_geo=NULL;
+       attr_free(this->position_coord_geo);
+       this->position_coord_geo=NULL;
        if (p) {
                transform_reverse(trans, p, &c);
-               dbg(0,"x=0x%x y=0x%x\n", c.x, c.y);
+               dbg(1,"x=0x%x y=0x%x\n", c.x, c.y);
                this->clickp.pro=transform_get_projection(trans);
                this->clickp.x=c.x;
                this->clickp.y=c.y;
-               this->clickp_valid=1;
+               transform_to_geo(this->clickp.pro, &c, &g);
+               attr.u.coord_geo=&g;
+               attr.type=attr_click_coord_geo;
+               this->click_coord_geo=attr_dup(&attr);
        }
        if (navit_get_attr(this->nav, attr_vehicle, &attr, NULL) && attr.u.vehicle
                && vehicle_get_attr(attr.u.vehicle, attr_position_coord_geo, &attrp, NULL)) {
+               this->position_coord_geo=attr_dup(&attrp);
                this->vehiclep.pro=transform_get_projection(trans);
                transform_from_geo(this->vehiclep.pro, attrp.u.coord_geo, &c);
                this->vehiclep.x=c.x;
                this->vehiclep.y=c.y;
                this->vehicle_valid=1;
-       }       
+       }
        // draw menu
-       this->root.p.x=0;
-       this->root.p.y=0;
-       this->root.background=this->background;
        gui_internal_menu_root(this);
 }
 
 static void
+gui_internal_cmd_menu2(struct gui_priv *this)
+{
+       gui_internal_cmd_menu(this, NULL, 1);
+}
+
+
+static void
+gui_internal_cmd_log_do(struct gui_priv *this, struct widget *widget)
+{
+       if (widget->text && strlen(widget->text))
+               navit_textfile_debug_log(this->nav, "type=log_entry label=\"%s\"",widget->text);
+       g_free(widget->text);
+       widget->text=NULL;
+       gui_internal_prune_menu(this, NULL);
+       gui_internal_check_exit(this);
+}
+
+static void
+gui_internal_cmd_log_clicked(struct gui_priv *this, struct widget *widget, void *data)
+{
+       gui_internal_cmd_log_do(this, widget->data);
+}
+
+static void
+gui_internal_cmd_log_changed(struct gui_priv *this, struct widget *wm, void *data)
+{
+       int len;
+       if (wm->text) {
+               len=strlen(wm->text);
+               if (len && (wm->text[len-1] == '\n' || wm->text[len-1] == '\r')) {
+                       wm->text[len-1]='\0';
+                       gui_internal_cmd_log_do(this, wm);
+               }
+       }
+}
+
+
+static void
+gui_internal_cmd_log(struct gui_priv *this)
+{
+       struct widget *w,*wb,*wk,*wl,*we,*wnext;
+       gui_internal_enter(this, 1);
+       wb=gui_internal_menu(this, "Log Message");
+       w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill);
+       gui_internal_widget_append(wb, w);
+       we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill);
+       gui_internal_widget_append(w, we);
+       gui_internal_widget_append(we, wk=gui_internal_label_new(this, _("Message")));
+       wk->state |= STATE_EDIT|STATE_CLEAR;
+       wk->background=this->background;
+       wk->flags |= flags_expand|flags_fill;
+       wk->func = gui_internal_cmd_log_changed;
+       gui_internal_widget_append(we, wnext=gui_internal_image_new(this, image_new_xs(this, "gui_active")));
+       wnext->state |= STATE_SENSITIVE;
+       wnext->func = gui_internal_cmd_log_clicked;
+       wnext->data=wk;
+       wl=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill);
+       gui_internal_widget_append(w, wl);
+       if (this->keyboard)
+               gui_internal_widget_append(w, gui_internal_keyboard(this,2));
+       gui_internal_menu_render(this);
+       gui_internal_leave(this);
+}
+
+static void
 gui_internal_check_exit(struct gui_priv *this)
 {
        struct graphics *gra=this->gra;
@@ -2827,27 +3876,131 @@ gui_internal_check_exit(struct gui_priv *this)
        }
 }
 
+static int
+gui_internal_get_attr(struct gui_priv *this, enum attr_type type, struct attr *attr)
+{
+       switch (type) {
+       case attr_active:
+               attr->u.num=this->root.children != NULL;
+               break;
+       case attr_click_coord_geo:
+               if (!this->click_coord_geo)
+                       return 0;
+               *attr=*this->click_coord_geo;
+               break;
+       case attr_position_coord_geo:
+               if (!this->position_coord_geo)
+                       return 0;
+               *attr=*this->position_coord_geo;
+               break;
+       case attr_pitch:
+               attr->u.num=this->pitch;
+               break;
+       default:
+               return 0;
+       }
+       attr->type=type;
+       return 1;
+}
+
+static int
+gui_internal_add_attr(struct gui_priv *this, struct attr *attr)
+{
+       switch (attr->type) {
+       case attr_xml_text:
+               g_free(this->html_text);
+               this->html_text=g_strdup(attr->u.str);
+               return 1;
+       default:
+               return 0;
+       }
+}
+
+static int
+gui_internal_set_attr(struct gui_priv *this, struct attr *attr)
+{
+       switch (attr->type) {
+       case attr_fullscreen:
+               if ((this->fullscreen > 0) != (attr->u.num > 0)) {
+                       graphics_draw_mode(this->gra, draw_mode_end);
+                       this->win->fullscreen(this->win, attr->u.num > 0);
+                       graphics_draw_mode(this->gra, draw_mode_begin);
+               }
+               this->fullscreen=attr->u.num;
+               return 1;
+       default:
+               dbg(0,"%s\n",attr_to_name(attr->type));
+               return 0;
+       }
+}
+
+static void gui_internal_dbus_signal(struct gui_priv *this, struct point *p)
+{
+       struct displaylist_handle *dlh;
+       struct displaylist *display;
+       struct displayitem *di;
+
+       display=navit_get_displaylist(this->nav);
+       dlh=graphics_displaylist_open(display);
+       while ((di=graphics_displaylist_next(dlh))) {
+               struct item *item=graphics_displayitem_get_item(di);
+               if (item_is_point(*item) && graphics_displayitem_get_displayed(di) &&
+                       graphics_displayitem_within_dist(display, di, p, 10)) {
+                       struct map_rect *mr=map_rect_new(item->map, NULL);
+                       struct item *itemo=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
+                       struct attr attr;
+                       if (item_attr_get(itemo, attr_data, &attr)) {
+                               struct attr cb,*attr_list[2];
+                               int valid=0;
+                               attr.type=attr_data;
+                               attr_list[0]=&attr;
+                               attr_list[1]=NULL;
+                                       if (navit_get_attr(this->nav, attr_callback_list, &cb, NULL)) 
+                                               callback_list_call_attr_4(cb.u.callback_list, attr_command, "dbus_send_signal", attr_list, NULL, &valid);
+                       }
+                       map_rect_destroy(mr);
+               }
+       }
+               graphics_displaylist_close(dlh);
+}
+
+
 //##############################################################################################################
 //# Description: Function to handle mouse clicks and scroll wheel movement
-//# Comment: 
+//# Comment:
 //# Authors: Martin Schaller (04/2008), Stefan Klumpp (04/2008)
 //##############################################################################################################
 static void gui_internal_button(void *data, int pressed, int button, struct point *p)
 {
        struct gui_priv *this=data;
        struct graphics *gra=this->gra;
-       
+
+       dbg(1,"enter %d %d\n", pressed, button);
        // if still on the map (not in the menu, yet):
+       dbg(1,"children=%p ignore_button=%d\n",this->root.children,this->ignore_button);
        if (!this->root.children || this->ignore_button) {
+
                this->ignore_button=0;
-               // check whether the position of the mouse changed during press/release OR if it is the scrollwheel 
-               if (!navit_handle_button(this->nav, pressed, button, p, NULL) || button >=4) // Maybe there's a better way to do this
+               // check whether the position of the mouse changed during press/release OR if it is the scrollwheel
+               if (!navit_handle_button(this->nav, pressed, button, p, NULL)) {
+                       dbg(1,"navit has handled button\n");
+                       return;
+               }
+               dbg(1,"menu_on_map_click=%d\n",this->menu_on_map_click);
+               if (button != 1)
                        return;
-               if (this->menu_on_map_click)
-                       gui_internal_cmd_menu(this, p, 0);      
+               if (this->menu_on_map_click) {
+                       gui_internal_cmd_menu(this, p, 0);
+                       return;
+               }
+               if (this->signal_on_map_click) {
+                       gui_internal_dbus_signal(this, p);
+                       return;
+               }
                return;
        }
-       
+
+
        // if already in the menu:
        if (pressed) {
                this->pressed=1;
@@ -2865,27 +4018,53 @@ static void gui_internal_button(void *data, int pressed, int button, struct poin
        }
 }
 
+static void
+gui_internal_setup_gc(struct gui_priv *this)
+{
+       struct color cbh={0x9fff,0x9fff,0x9fff,0xffff};
+       struct color cf={0xbfff,0xbfff,0xbfff,0xffff};
+       struct graphics *gra=this->gra;
+
+       if (this->background)
+               return;
+       this->background=graphics_gc_new(gra);
+       this->background2=graphics_gc_new(gra);
+       this->highlight_background=graphics_gc_new(gra);
+       graphics_gc_set_foreground(this->highlight_background, &cbh);
+       this->foreground=graphics_gc_new(gra);
+       graphics_gc_set_foreground(this->foreground, &cf);
+       this->text_background=graphics_gc_new(gra);
+       this->text_foreground=graphics_gc_new(gra);
+       graphics_gc_set_foreground(this->background, &this->background_color);
+       graphics_gc_set_foreground(this->background2, &this->background2_color);
+       graphics_gc_set_foreground(this->text_background, &this->text_background_color);
+       graphics_gc_set_foreground(this->text_foreground, &this->text_foreground_color);
+}
+
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 static void gui_internal_resize(void *data, int w, int h)
 {
        struct gui_priv *this=data;
+       int changed=0;
 
-       if( this->root.w==w && this->root.h==h)
-                return;
+       gui_internal_setup_gc(this);
 
-       this->root.w=w;
-       this->root.h=h;
+       if (this->root.w != w || this->root.h != h) {
+               this->root.w=w;
+               this->root.h=h;
+               changed=1;
+       }
        dbg(1,"w=%d h=%d children=%p\n", w, h, this->root.children);
        navit_handle_resize(this->nav, w, h);
-       if (this->root.children) {
+       if (this->root.children && changed) {
                gui_internal_prune_menu(this, NULL);
                gui_internal_menu_root(this);
        }
-} 
+}
 
 static void
 gui_internal_keynav_point(struct widget *w, int dx, int dy, struct point *p)
@@ -2896,7 +4075,7 @@ gui_internal_keynav_point(struct widget *w, int dx, int dy, struct point *p)
                p->x=w->p.x;
        if (dx > 0)
                p->x=w->p.x+w->w;
-       if (dy < 0) 
+       if (dy < 0)
                p->y=w->p.y;
        if (dy > 0)
                p->y=w->p.y+w->h;
@@ -2984,8 +4163,8 @@ gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy)
 }
 
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 static void gui_internal_keypress(void *data, char *key)
@@ -2999,22 +4178,22 @@ static void gui_internal_keypress(void *data, char *key)
                case NAVIT_KEY_UP:
                        p.x=w/2;
                        p.y=0;
-                       navit_set_center_screen(this->nav, &p);
+                       navit_set_center_screen(this->nav, &p, 1);
                        break;
                case NAVIT_KEY_DOWN:
                        p.x=w/2;
                        p.y=h;
-                       navit_set_center_screen(this->nav, &p);
+                       navit_set_center_screen(this->nav, &p, 1);
                        break;
                case NAVIT_KEY_LEFT:
                        p.x=0;
                        p.y=h/2;
-                       navit_set_center_screen(this->nav, &p);
+                       navit_set_center_screen(this->nav, &p, 1);
                        break;
                case NAVIT_KEY_RIGHT:
                        p.x=w;
                        p.y=h/2;
-                       navit_set_center_screen(this->nav, &p);
+                       navit_set_center_screen(this->nav, &p, 1);
                        break;
                case NAVIT_KEY_ZOOM_IN:
                        navit_zoom_in(this->nav, 2, NULL);
@@ -3023,6 +4202,7 @@ static void gui_internal_keypress(void *data, char *key)
                        navit_zoom_out(this->nav, 2, NULL);
                        break;
                case NAVIT_KEY_RETURN:
+               case NAVIT_KEY_MENU:
                        gui_internal_cmd_menu(this, NULL, 0);
                        break;
                }
@@ -3042,6 +4222,8 @@ static void gui_internal_keypress(void *data, char *key)
        case NAVIT_KEY_DOWN:
                gui_internal_keynav_highlight_next(this,0,1);
                break;
+       case NAVIT_KEY_BACK:
+               break;
        case NAVIT_KEY_RETURN:
                if (this->highlighted && this->highlighted_menu == g_list_last(this->root.children)->data)
                        gui_internal_call_highlighted(this);
@@ -3053,33 +4235,26 @@ static void gui_internal_keypress(void *data, char *key)
        }
        graphics_draw_mode(this->gra, draw_mode_end);
        gui_internal_check_exit(this);
-} 
+}
 
 
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 static int gui_internal_set_graphics(struct gui_priv *this, struct graphics *gra)
 {
        struct window *win;
-#if 0
-       struct color cb={0x7fff,0x7fff,0x7fff,0xffff};
-#endif
-       struct color cb={0x0,0x0,0x0,0xffff};
-       struct color cb2={0x4141,0x4141,0x4141,0xffff};
-       struct color cbh={0x9fff,0x9fff,0x9fff,0xffff};
-       struct color cf={0xbfff,0xbfff,0xbfff,0xffff};
-       struct color cw={0xffff,0xffff,0xffff,0xffff};
        struct transformation *trans=navit_get_trans(this->nav);
-       
+
        win=graphics_get_data(gra, "window");
         if (! win)
                 return 1;
        navit_ignore_graphics_events(this->nav, 1);
        this->gra=gra;
        this->win=win;
+       navit_ignore_graphics_events(this->nav, 1);
        transform_get_size(trans, &this->root.w, &this->root.h);
        this->resize_cb=callback_new_attr_1(callback_cast(gui_internal_resize), attr_resize, this);
        graphics_add_callback(gra, this->resize_cb);
@@ -3089,131 +4264,166 @@ static int gui_internal_set_graphics(struct gui_priv *this, struct graphics *gra
        graphics_add_callback(gra, this->motion_cb);
        this->keypress_cb=callback_new_attr_1(callback_cast(gui_internal_keypress), attr_keypress, this);
        graphics_add_callback(gra, this->keypress_cb);
-       this->background=graphics_gc_new(gra);
-       graphics_gc_set_foreground(this->background, &cb);
-       this->background2=graphics_gc_new(gra);
-       graphics_gc_set_foreground(this->background2, &cb2);
-       this->highlight_background=graphics_gc_new(gra);
-       graphics_gc_set_foreground(this->highlight_background, &cbh);
-       this->foreground=graphics_gc_new(gra);
-       graphics_gc_set_foreground(this->foreground, &cf);
-       this->text_background=graphics_gc_new(gra);
-       graphics_gc_set_foreground(this->text_background, &cb);
-       this->text_foreground=graphics_gc_new(gra);
-       graphics_gc_set_foreground(this->text_foreground, &cw);
-       
+       this->window_closed_cb=callback_new_attr_1(callback_cast(gui_internal_window_closed), attr_window_closed, this);
+       graphics_add_callback(gra, this->window_closed_cb);
+
        // set fullscreen if needed
        if (this->fullscreen)
-               this->win->fullscreen(this->win, this->fullscreen);
+               this->win->fullscreen(this->win, this->fullscreen != 0);
+       /* Was resize callback already issued? */
+       if (navit_get_ready(this->nav) & 2)
+               gui_internal_setup_gc(this);
        return 0;
 }
 
+static void gui_internal_disable_suspend(struct gui_priv *this)
+{
+       if (this->win->disable_suspend)
+               this->win->disable_suspend(this->win);
+}
+
 //##############################################################################################################
-//# Description: 
-//# Comment: 
+//# Description:
+//# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
 struct gui_methods gui_internal_methods = {
        NULL,
        NULL,
         gui_internal_set_graphics,
+       NULL,
+       NULL,
+       NULL,
+       gui_internal_disable_suspend,
+       gui_internal_get_attr,
+       gui_internal_add_attr,
+       gui_internal_set_attr,
 };
 
-//##############################################################################################################
-//# Description: 
-//# Comment: 
-//# Authors: Martin Schaller (04/2008)
-//##############################################################################################################
-static struct gui_priv * gui_internal_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs) 
+static void
+gui_internal_get_data(struct gui_priv *priv, char *command, struct attr **in, struct attr ***out)
 {
-       struct gui_priv *this;
-       struct attr *attr;
-       *meth=gui_internal_methods;
-       this=g_new0(struct gui_priv, 1);
-       this->nav=nav;
-       if ((attr=attr_search(attrs, NULL, attr_menu_on_map_click)))
-               this->menu_on_map_click=attr->u.num;
-       else
-               this->menu_on_map_click=1;
-       navit_command_register(nav,"gui_internal_menu",callback_new_3(callback_cast(gui_internal_cmd_menu),this,NULL,(void *)1));
-       navit_command_register(nav,"gui_internal_fullscreen",callback_new_2(callback_cast(gui_internal_cmd_fullscreen),this,NULL));
+       struct attr private_data = (struct attr) { attr_private_data, {(void *)&priv->data}};
+       if (out)
+               *out=attr_generic_add_attr(*out, &private_data);
+}
 
-       if( (attr=attr_search(attrs,NULL,attr_font_size)))
-        {
-         this->config.font_size=attr->u.num;
-       }
-       else
-       {
-         this->config.font_size=-1;
-       }
-       if( (attr=attr_search(attrs,NULL,attr_icon_xs)))
-       {
-         this->config.icon_xs=attr->u.num;
-       }
-       else
-       {
-         this->config.icon_xs=-1;
-       }
-       if( (attr=attr_search(attrs,NULL,attr_icon_l)))
-       {
-         this->config.icon_l=attr->u.num;
-       }
-       else
-        {
-         this->config.icon_l=-1;
-       }
-       if( (attr=attr_search(attrs,NULL,attr_icon_s)))
-       {
-         this->config.icon_s=attr->u.num;
-       }
-       else
-        {
-         this->config.icon_s=-1;
-       }
-       if( (attr=attr_search(attrs,NULL,attr_spacing)))
-       {
-         this->config.spacing=attr->u.num;
-       }
-       else
-       {
-         this->config.spacing=-1;        
-       }
-       if( (attr=attr_search(attrs,NULL,attr_gui_speech)))
-       {
-         this->speech=attr->u.num;
-       }
-       if( (attr=attr_search(attrs,NULL,attr_keyboard)))
-         this->keyboard=attr->u.num;
-        else
-         this->keyboard=1;
-       
-    if( (attr=attr_search(attrs,NULL,attr_fullscreen)))
-      this->fullscreen=attr->u.num;
+static void
+gui_internal_add_callback(struct gui_priv *priv, struct callback *cb)
+{
+       callback_list_add(priv->cbl, cb);
+}
 
-       return this;
+static void
+gui_internal_remove_callback(struct gui_priv *priv, struct callback *cb)
+{
+       callback_list_remove(priv->cbl, cb);
 }
 
-//##############################################################################################################
-//# Description: 
-//# Comment: 
-//# Authors: Martin Schaller (04/2008)
-//##############################################################################################################
-void plugin_init(void)
+
+static struct gui_internal_methods gui_internal_methods_ext = {
+       gui_internal_add_callback,
+       gui_internal_remove_callback,
+       gui_internal_menu_render,
+        image_new_xs,
+        image_new_l,
+};
+
+
+static enum flags
+gui_internal_get_flags(struct widget *widget)
 {
-       plugin_register_gui_type("internal", gui_internal_new);
+       return widget->flags;
 }
 
+static void
+gui_internal_set_flags(struct widget *widget, enum flags flags)
+{
+       widget->flags=flags;
+}
+
+static int
+gui_internal_get_state(struct widget *widget)
+{
+       return widget->state;
+}
+
+static void
+gui_internal_set_state(struct widget *widget, int state)
+{
+       widget->state=state;
+}
+
+static void
+gui_internal_set_func(struct widget *widget, void (*func)(struct gui_priv *priv, struct widget *widget, void *data))
+{
+       widget->func=func;
+}
+
+static void
+gui_internal_set_data(struct widget *widget, void *data)
+{
+       widget->data=data;
+}
+
+static void
+gui_internal_set_default_background(struct gui_priv *this, struct widget *widget)
+{
+       widget->background=this->background;
+}
+
+static struct gui_internal_widget_methods gui_internal_widget_methods = {
+       gui_internal_widget_append,
+        gui_internal_button_new,
+        gui_internal_button_new_with_callback,
+        gui_internal_box_new,
+        gui_internal_label_new,
+        gui_internal_image_new,
+        gui_internal_keyboard,
+       gui_internal_menu,
+       gui_internal_get_flags,
+       gui_internal_set_flags,
+       gui_internal_get_state,
+       gui_internal_set_state,
+       gui_internal_set_func,
+       gui_internal_set_data,
+       gui_internal_set_default_background,
+};
+
+static void
+gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid)
+{
+       char *str=NULL,*str2=NULL;
+       dbg(1,"enter %s %p %p %p\n",function,in,out,valid);
+       if (!in || !in[0])
+               return;
+       dbg(1,"%s\n",attr_to_name(in[0]->type));        
+       if (ATTR_IS_STRING(in[0]->type)) {
+               str=in[0]->u.str;
+       }
+       if (ATTR_IS_COORD_GEO(in[0]->type)) {
+               str=str2=coordinates_geo(in[0]->u.coord_geo, '\n');
+       }
+       if (str) {
+               str=g_strdup_printf("<html>%s</html>\n",str);
+               xml_parse_text(str, this, gui_internal_html_start, gui_internal_html_end, gui_internal_html_text);
+       }
+       g_free(str);
+       g_free(str2);
+}
+
+
 /**
  * @brief Creates a new table widget.
- * 
+ *
  * Creates and returns a new table widget.  This function will
  * setup next/previous buttons as children.
- * 
+ *
  * @param this The graphics context.
  * @param flags widget sizing flags.
  * @returns The newly created widget
  */
-struct widget * gui_internal_widget_table_new(struct gui_priv * this, enum flags flags)
+struct widget * gui_internal_widget_table_new(struct gui_priv * this, enum flags flags, int buttons)
 {
        struct widget * widget = g_new0(struct widget,1);
        struct table_data * data = NULL;
@@ -3222,60 +4432,84 @@ struct widget * gui_internal_widget_table_new(struct gui_priv * this, enum flags
        widget->data = g_new0(struct table_data,1);
        widget->data_free=gui_internal_table_data_free;
        data = (struct table_data*)widget->data;
-       
 
+
+       if (buttons) {
        data->next_button = gui_internal_button_new_with_callback
                (this,"Next",image_new_xs(this, "gui_active") ,
                 gravity_left_center  |orientation_vertical,
                 gui_internal_table_button_next,NULL);
        data->next_button->data=widget;
-       
-  
+
+
        data->prev_button =  gui_internal_button_new_with_callback
                (this,"Prev",
                 image_new_xs(this, "gui_active")
                 ,gravity_right_center |orientation_vertical,
                 gui_internal_table_button_prev,NULL);
-       
+
        data->prev_button->data=widget;
-       
+
        data->this=this;
-       
+
        data->button_box=gui_internal_box_new(this,
                                              gravity_center|orientation_horizontal);
        data->button_box->children=g_list_append(data->button_box->children,
                                                 data->next_button);
        data->button_box->children=g_list_append(data->button_box->children,
                                                 data->prev_button);
-       data->button_box->background=this->background2;
+       //data->button_box->background=this->background2;
        data->button_box->bl=this->spacing;
        widget->children=g_list_append(widget->children,data->button_box);
        gui_internal_widget_pack(this,data->button_box);
-       
+       }
+
        return widget;
 
 }
 
 /**
- *
- * @brief Adds a row to a table_widget.
- *
- * @param table The table to add the row to.
- * @param row A table_row widget that will be added to the table.
+ * @brief Clears all the rows from the table.
+ * This function removes all rows from a table.
+ * New rows can later be added to the table.
  */
-void gui_internal_widget_table_add_row(struct widget * table,  struct widget *  row)
+void gui_internal_widget_table_clear(struct gui_priv * this,struct widget * table)
 {
-  table->children=g_list_append(table->children,row);
-  
+  GList * iter;
+  struct table_data * table_data = (struct table_data* ) table->data;
+
+  iter = table->children;
+  while(iter ) {
+         if(iter->data != table_data->button_box) {
+                 struct widget * child = (struct widget*)iter->data;
+                 gui_internal_widget_destroy(this,child);
+                 if(table->children == iter) {
+                         table->children = g_list_remove(iter,iter->data);
+                         iter=table->children;
+                 }
+                 else
+                         iter = g_list_remove(iter,iter->data);
+         }
+         else {
+                 iter = g_list_next(iter);
+         }
+
+  }
+  table_data->top_row=NULL;
+  table_data->bottom_row=NULL;
+  if(table_data->page_headers)
+         g_list_free(table_data->page_headers);
+  table_data->page_headers=NULL;
 }
 
+
 /**
  * Creates a new table_row widget.
  * @param this The graphics context
  * @param flags Sizing flags for the row
  * @returns The new table_row widget.
  */
-static struct widget * gui_internal_widget_table_row_new(struct gui_priv * this, enum flags flags)
+struct widget * gui_internal_widget_table_row_new(struct gui_priv * this, enum flags flags)
 {
        struct widget * widget = g_new0(struct widget,1);
        widget->type=widget_table_row;
@@ -3296,9 +4530,9 @@ static struct widget * gui_internal_widget_table_row_new(struct gui_priv * this,
  *
  * The caller is responsible for freeing the returned list.
  */
-static GList * gui_internal_compute_table_dimensions(struct widget * w)
+static GList * gui_internal_compute_table_dimensions(struct gui_priv * this,struct widget * w)
 {
-  
+
        GList * column_desc = NULL;
        GList * current_desc=NULL;
        GList * cur_row = w->children;
@@ -3309,8 +4543,9 @@ static GList * gui_internal_compute_table_dimensions(struct widget * w)
        struct table_data * table_data=NULL;
        int height=0;
        int width=0;
+       int total_width=0;
+       int column_count=0;
 
-  
        /**
         * Scroll through the the table and
         * 1. Compute the maximum width + height of each column across all rows.
@@ -3324,18 +4559,21 @@ static GList * gui_internal_compute_table_dimensions(struct widget * w)
                {
                        continue;
                }
-               for(cur_column = cur_row_widget->children; cur_column; 
+               column_count=0;
+               for(cur_column = cur_row_widget->children; cur_column;
                    cur_column=g_list_next(cur_column))
                {
                        cell_w = (struct widget*) cur_column->data;
-                       if(current_desc == 0) 
+                       gui_internal_widget_pack(this,cell_w);
+                       if(current_desc == 0)
                        {
-                               current_cell = g_new0(struct table_column_desc,1);      
+                               current_cell = g_new0(struct table_column_desc,1);
                                column_desc = g_list_append(column_desc,current_cell);
                                current_desc = g_list_last(column_desc);
-                               current_cell->height=cell_w->h; 
-                               current_cell->width=cell_w->w; 
-                               
+                               current_cell->height=cell_w->h;
+                               current_cell->width=cell_w->w;
+                               total_width+=cell_w->w;
+
                        }
                        else
                        {
@@ -3348,14 +4586,33 @@ static GList * gui_internal_compute_table_dimensions(struct widget * w)
                                }
                                if(current_cell->width < width)
                                {
+                                       total_width += (width-current_cell->width);
                                        current_cell->width = width;
+
+
+
                                }
                                current_desc = g_list_next(current_desc);
                        }
-                       
+                       column_count++;
+
                }/* column loop */
-               
+
        } /*row loop */
+
+
+       /**
+        * If the width of all columns is less than the width off
+        * the table expand each cell proportionally.
+        *
+        */
+       if(total_width+(this->spacing*column_count) < w->w ) {
+               for(current_desc=column_desc; current_desc; current_desc=g_list_next(current_desc)) {
+                       current_cell = (struct table_column_desc*) current_desc->data;
+                       current_cell->width= ( (current_cell->width+this->spacing)/(float)total_width) * w->w ;
+               }
+       }
+
        return column_desc;
 }
 
@@ -3372,15 +4629,15 @@ static GList * gui_internal_compute_table_dimensions(struct widget * w)
  */
 void gui_internal_table_pack(struct gui_priv * this, struct widget * w)
 {
-  
+
        int height=0;
        int width=0;
        int count=0;
-       GList * column_data = gui_internal_compute_table_dimensions(w);
+       GList * column_data = gui_internal_compute_table_dimensions(this,w);
        GList * current=0;
        struct table_column_desc * cell_desc=0;
        struct table_data * table_data = (struct table_data*)w->data;
-       
+
        for(current = column_data; current; current=g_list_next(current))
        {
                if(table_data->button_box == current->data )
@@ -3389,12 +4646,14 @@ void gui_internal_table_pack(struct gui_priv * this, struct widget * w)
                }
                cell_desc = (struct table_column_desc *) current->data;
                width = width + cell_desc->width + this->spacing;
-               if(height < cell_desc->height) 
+               if(height < cell_desc->height)
                {
                        height = cell_desc->height ;
                }
        }
 
+
+
        for(current=w->children; current; current=g_list_next(current))
        {
                if(current->data!= table_data->button_box)
@@ -3402,19 +4661,21 @@ void gui_internal_table_pack(struct gui_priv * this, struct widget * w)
                        count++;
                }
        }
-       gui_internal_widget_pack(this,table_data->button_box);  
-       w->h = count * (height+this->spacing) +  table_data->button_box + this->spacing;
-       
+       if (table_data->button_box)
+               gui_internal_widget_pack(this,table_data->button_box);
+
+
+
        if(w->h + w->c.y   > this->root.h   )
        {
                /**
                 * Do not allow the widget to exceed the screen.
-                * 
+                *
                 */
                w->h = this->root.h- w->c.y  - height;
        }
        w->w = width;
-       
+
        /**
         * Deallocate column descriptions.
         */
@@ -3423,14 +4684,14 @@ void gui_internal_table_pack(struct gui_priv * this, struct widget * w)
        {
                current = g_list_remove(current,current->data);
        }
-       
+
 }
 
 
 
 /**
  * @brief Renders a table widget.
- * 
+ *
  * @param this The graphics context
  * @param w The table widget to render.
  */
@@ -3444,24 +4705,26 @@ void gui_internal_table_render(struct gui_priv * this, struct widget * w)
        GList * current_desc=NULL;
        struct table_data * table_data = (struct table_data*)w->data;
        int is_skipped=0;
+       int is_first_page=1;
        struct table_column_desc * dim=NULL;
-       
-       column_desc = gui_internal_compute_table_dimensions(w);
-       
+
+       dbg_assert(table_data);
+       column_desc = gui_internal_compute_table_dimensions(this,w);
        y=w->p.y;
-       
+
        /**
         * Skip rows that are on previous pages.
         */
        cur_row = w->children;
-       if(table_data->top_row )
+       if(table_data->top_row && table_data->top_row != w->children )
        {
                cur_row = table_data->top_row;
+               is_first_page=0;
        }
-       
-       
+
+
        /**
-        * Loop through each row.  Drawing each cell with the proper sizes, 
+        * Loop through each row.  Drawing each cell with the proper sizes,
         * at the proper positions.
         */
        for(table_data->top_row=cur_row; cur_row; cur_row = g_list_next(cur_row))
@@ -3470,36 +4733,40 @@ void gui_internal_table_render(struct gui_priv * this, struct widget * w)
                current_desc = column_desc;
                struct widget * cur_row_widget = (struct widget*)cur_row->data;
                int max_height=0;
-               x =w->p.x+this->spacing;        
+               x =w->p.x+this->spacing;
                if(cur_row_widget == table_data->button_box )
                {
                        continue;
                }
                dim = (struct table_column_desc*)current_desc->data;
-               
-               if( y + dim->height + table_data->button_box->h + this->spacing >= w->p.y + w->h )
+
+               if( y + dim->height + (table_data->button_box ? table_data->button_box->h : 0) + this->spacing >= w->p.y + w->h )
                {
                        /*
                         * No more drawing space left.
                         */
                        is_skipped=1;
                        break;
-                       
-               }      
-               for(cur_column = cur_row_widget->children; cur_column; 
+
+               }
+               for(cur_column = cur_row_widget->children; cur_column;
                    cur_column=g_list_next(cur_column))
                {
                        struct  widget * cur_widget = (struct widget*) cur_column->data;
                        dim = (struct table_column_desc*)current_desc->data;
-                       
+
                        cur_widget->p.x=x;
                        cur_widget->w=dim->width;
                        cur_widget->p.y=y;
                        cur_widget->h=dim->height;
-                       x=x+dim->width;
+                       x=x+cur_widget->w;
                        max_height = dim->height;
+                       /* We pack the widget before rendering to ensure that the x and y
+                        * coordinates get pushed down.
+                        */
+                       gui_internal_widget_pack(this,cur_widget);
                        gui_internal_widget_render(this,cur_widget);
-      
+
                        if(dim->height > max_height)
                        {
                                max_height = dim->height;
@@ -3509,30 +4776,30 @@ void gui_internal_table_render(struct gui_priv * this, struct widget * w)
                table_data->bottom_row=cur_row;
                current_desc = g_list_next(current_desc);
        }
-       if(table_data  && table_data->button_box )
+       if(table_data->button_box && (is_skipped || !is_first_page)  )
        {
-               table_data->button_box->p.y =w->p.y+w->h-table_data->button_box->h - 
+               table_data->button_box->p.y =w->p.y+w->h-table_data->button_box->h -
                        this->spacing;
                if(table_data->button_box->p.y < y )
                {
                        table_data->button_box->p.y=y;
-               }       
+               }
                table_data->button_box->p.x = w->p.x;
                table_data->button_box->w = w->w;
                //    table_data->button_box->h = w->h - y;
-               //    table_data->next_button->h=table_data->button_box->h;    
+               //    table_data->next_button->h=table_data->button_box->h;
                //    table_data->prev_button->h=table_data->button_box->h;
-               //    table_data->next_button->c.y=table_data->button_box->c.y;    
-               //    table_data->prev_button->c.y=table_data->button_box->c.y;    
+               //    table_data->next_button->c.y=table_data->button_box->c.y;
+               //    table_data->prev_button->c.y=table_data->button_box->c.y;
 
                gui_internal_widget_pack(this,table_data->button_box);
                if(table_data->next_button->p.y > w->p.y + w->h + table_data->next_button->h)
                {
-               
-                       table_data->button_box->p.y = w->p.y + w->h - 
+
+                       table_data->button_box->p.y = w->p.y + w->h -
                                table_data->button_box->h;
                }
-               if(is_skipped) 
+               if(is_skipped)
                {
                        table_data->next_button->state|= STATE_SENSITIVE;
                }
@@ -3540,7 +4807,7 @@ void gui_internal_table_render(struct gui_priv * this, struct widget * w)
                {
                        table_data->next_button->state&= ~STATE_SENSITIVE;
                }
-               
+
                if(table_data->top_row != w->children)
                {
                        table_data->prev_button->state|= STATE_SENSITIVE;
@@ -3550,10 +4817,10 @@ void gui_internal_table_render(struct gui_priv * this, struct widget * w)
                        table_data->prev_button->state&= ~STATE_SENSITIVE;
                }
                gui_internal_widget_render(this,table_data->button_box);
-               
+
 
        }
-       
+
        /**
         * Deallocate column descriptions.
         */
@@ -3566,36 +4833,330 @@ void gui_internal_table_render(struct gui_priv * this, struct widget * w)
 
 
 /**
- * TEST function for demonstrating table.
+ * @brief Displays Route information
+ *
+ * @li The name of the active vehicle
+ * @param wm The button that was pressed.
+ * @param v Unused
  */
-void gui_internal_cmd_route(struct gui_priv * this, struct widget * wm)
+static void
+gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
-#if 0
+
 
        struct widget * menu;
-       struct widget * w;
-       int idx;
-       char buffer[10];
-       
-       w = gui_internal_widget_table_new(this,gravity_center | orientation_vertical);
-       w->c = wm->c;
-       for(idx=0; idx < 52; idx++)
+       struct widget * row;
+
+
+       if(! this->vehicle_cb)
        {
-               struct widget * row = gui_internal_widget_table_row_new
-                       (this,gravity_left_top);
-               sprintf(buffer, "Test %d",idx);
-               row->children = g_list_append(row->children,
-                                             gui_internal_label_new(this,buffer));
-               row->children= g_list_append(row->children,
-                                            gui_internal_label_new(this,"column 2 4 6 8"));
-               gui_internal_widget_table_add_row(w,row);
-       }
-       menu=gui_internal_menu(this,"Route");
-       gui_internal_widget_append(menu,w);
+         /**
+          * Register the callback on vehicle updates.
+          */
+         this->vehicle_cb = callback_new_attr_1(callback_cast(gui_internal_route_update),
+                                                      attr_position_coord_geo,this);
+         navit_add_callback(this->nav,this->vehicle_cb);
+       }
+
+       this->route_data.route_table = gui_internal_widget_table_new(this,gravity_left_top | flags_fill | flags_expand |orientation_vertical,1);
+       row = gui_internal_widget_table_row_new(this,gravity_left | orientation_horizontal | flags_fill);
+
+       row = gui_internal_widget_table_row_new(this,gravity_left | orientation_horizontal | flags_fill);
+
+
+       menu=gui_internal_menu(this,_("Route Description"));
+
+       menu->free=gui_internal_route_screen_free;
+       this->route_data.route_showing=1;
+       this->route_data.route_table->spx = this->spacing;
+
+
+       struct widget * box = gui_internal_box_new(this, gravity_left_top| orientation_vertical | flags_fill | flags_expand);
+
+       //      gui_internal_widget_append(box,gui_internal_box_new_with_label(this,"Test"));
+       gui_internal_widget_append(box,this->route_data.route_table);
+       box->w=menu->w;
+       box->spx = this->spacing;
+       this->route_data.route_table->w=box->w;
+       gui_internal_widget_append(menu,box);
+       gui_internal_populate_route_table(this,this->nav);
        gui_internal_menu_render(this);
-#endif
+
+}
+
+static int
+line_intersection(struct coord* a1, struct coord *a2, struct coord * b1, struct coord *b2, struct coord *res)
+{
+        int n, a, b;
+       int adx=a2->x-a1->x;
+       int ady=a2->y-a1->y;
+       int bdx=b2->x-b1->x;
+       int bdy=b2->y-b1->y;
+        n = bdy * adx - bdx * ady;
+        a = bdx * (a1->y - b1->y) - bdy * (a1->x - b1->x);
+        b = adx * (a1->y - b1->y) - ady * (a1->x - b1->x);
+        if (n < 0) {
+                n = -n;
+                a = -a;
+                b = -b;
+        }
+        if (a < 0 || b < 0)
+                return 0;
+        if (a > n || b > n)
+                return 0;
+       if (n == 0) {
+               dbg(0,"a=%d b=%d n=%d\n", a, b, n);
+               dbg(0,"a1=0x%x,0x%x ad %d,%d\n", a1->x, a1->y, adx, ady);
+               dbg(0,"b1=0x%x,0x%x bd %d,%d\n", b1->x, b1->y, bdx, bdy);
+               dbg_assert(n != 0);
+       }
+        res->x = a1->x + a * adx / n;
+        res->y = a1->y + a * ady / n;
+        return 1;
+}
+
+struct heightline {
+       struct heightline *next;
+       int height;
+       struct coord_rect bbox;
+       int count;
+       struct coord c[0];
+};
+
+struct diagram_point {
+       struct diagram_point *next;
+       struct coord c;
+};
+
+static struct heightline *
+item_get_heightline(struct item *item)
+{
+       struct heightline *ret=NULL;
+       struct street_data *sd;
+       struct attr attr;
+       int i,height;
+
+       if (item_attr_get(item, attr_label, &attr)) {
+               height=atoi(attr.u.str);
+               sd=street_get_data(item);
+               if (sd && sd->count > 1) {
+                       ret=g_malloc(sizeof(struct heightline)+sd->count*sizeof(struct coord));
+                       ret->bbox.lu=sd->c[0];
+                       ret->bbox.rl=sd->c[0];
+                       ret->count=sd->count;
+                       ret->height=height;
+                       for (i = 0 ; i < sd->count ; i++) {
+                               ret->c[i]=sd->c[i];
+                               coord_rect_extend(&ret->bbox, sd->c+i);
+                       }
+               }
+               street_data_free(sd);
+       }
+       return ret;
+}
+
+
+/**
+ * @brief Displays Route Height Profile
+ *
+ * @li The name of the active vehicle
+ * @param wm The button that was pressed.
+ * @param v Unused
+ */
+static void
+gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
+{
+
+
+       struct widget * menu, *box;
+
+       struct map * map=NULL;
+       struct map_rect * mr=NULL;
+       struct route * route;
+       struct item * item =NULL;
+       struct mapset *ms;
+       struct mapset_handle *msh;
+       int x,i,first=1,dist=0;
+       struct coord c,last,res;
+       struct coord_rect rbbox,dbbox;
+       struct map_selection sel;
+       struct heightline *heightline,*heightlines=NULL;
+       struct diagram_point *min,*diagram_point,*diagram_points=NULL;
+       sel.next=NULL;
+       sel.order=18;
+       sel.range.min=type_height_line_1;
+       sel.range.max=type_height_line_3;
+
+
+       menu=gui_internal_menu(this,_("Height Profile"));
+       box = gui_internal_box_new(this, gravity_left_top| orientation_vertical | flags_fill | flags_expand);
+       gui_internal_widget_append(menu, box);
+       route = navit_get_route(this->nav);
+       if (route)
+               map = route_get_map(route);
+       if(map)
+               mr = map_rect_new(map,NULL);
+       if(mr) {
+               while((item = map_rect_get_item(mr))) {
+                       while (item_coord_get(item, &c, 1)) {
+                               if (first) {
+                                       first=0;
+                                       sel.u.c_rect.lu=c;
+                                       sel.u.c_rect.rl=c;
+                               } else
+                                       coord_rect_extend(&sel.u.c_rect, &c);
+                       }
+               }
+               map_rect_destroy(mr);
+               ms=navit_get_mapset(this->nav);
+               if (!first && ms) {
+                       msh=mapset_open(ms);
+                       while ((map=mapset_next(msh, 1))) {
+                               mr=map_rect_new(map, &sel);
+                               if (mr) {
+                                       while((item = map_rect_get_item(mr))) {
+                                               if (item->type >= sel.range.min && item->type <= sel.range.max) {
+                                                       heightline=item_get_heightline(item);
+                                                       if (heightline) {
+                                                               heightline->next=heightlines;
+                                                               heightlines=heightline;
+                                                       }
+                                               }
+                                       }
+                                       map_rect_destroy(mr);
+                               }
+                       }
+                       mapset_close(msh);
+               }
+       }
+       map=NULL;
+       mr=NULL;
+       if (route)
+               map = route_get_map(route);
+       if(map)
+               mr = map_rect_new(map,NULL);
+       if(mr && heightlines) {
+               while((item = map_rect_get_item(mr))) {
+                       first=1;
+                       while (item_coord_get(item, &c, 1)) {
+                               if (first)
+                                       first=0;
+                               else {
+                                       heightline=heightlines;
+                                       rbbox.lu=last;
+                                       rbbox.rl=last;
+                                       coord_rect_extend(&rbbox, &c);
+                                       while (heightline) {
+                                               if (coord_rect_overlap(&rbbox, &heightline->bbox)) {
+                                                       for (i = 0 ; i < heightline->count - 1; i++) {
+                                                               if (heightline->c[i].x != heightline->c[i+1].x || heightline->c[i].y != heightline->c[i+1].y) {
+                                                                       if (line_intersection(heightline->c+i, heightline->c+i+1, &last, &c, &res)) {
+                                                                               diagram_point=g_new(struct diagram_point, 1);
+                                                                               diagram_point->c.x=dist+transform_distance(projection_mg, &last, &res);
+                                                                               diagram_point->c.y=heightline->height;
+                                                                               diagram_point->next=diagram_points;
+                                                                               diagram_points=diagram_point;
+                                                                               dbg(0,"%d %d\n", diagram_point->c.x, diagram_point->c.y);
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                               heightline=heightline->next;
+                                       }
+                                       dist+=transform_distance(projection_mg, &last, &c);
+                               }
+                               last=c;
+                       }
+
+               }
+               map_rect_destroy(mr);
+       }
+
+
+       gui_internal_menu_render(this);
+       first=1;
+       diagram_point=diagram_points;
+       while (diagram_point) {
+               if (first) {
+                       dbbox.lu=diagram_point->c;
+                       dbbox.rl=diagram_point->c;
+                       first=0;
+               } else
+                       coord_rect_extend(&dbbox, &diagram_point->c);
+               diagram_point=diagram_point->next;
+       }
+       dbg(0,"%d %d %d %d\n", dbbox.lu.x, dbbox.lu.y, dbbox.rl.x, dbbox.rl.y);
+       if (dbbox.rl.x > dbbox.lu.x && dbbox.lu.x*100/(dbbox.rl.x-dbbox.lu.x) <= 25)
+               dbbox.lu.x=0;
+       if (dbbox.lu.y > dbbox.rl.y && dbbox.rl.y*100/(dbbox.lu.y-dbbox.rl.y) <= 25)
+               dbbox.rl.y=0;
+       dbg(0,"%d,%d %dx%d\n", box->p.x, box->p.y, box->w, box->h);
+       x=dbbox.lu.x;
+       first=1;
+       for (;;) {
+               struct point p[2];
+               min=NULL;
+               diagram_point=diagram_points;
+               while (diagram_point) {
+                       if (diagram_point->c.x >= x && (!min || min->c.x > diagram_point->c.x))
+                               min=diagram_point;
+                       diagram_point=diagram_point->next;
+               }
+               if (! min)
+                       break;
+               p[1].x=(min->c.x-dbbox.lu.x)*(box->w-10)/(dbbox.rl.x-dbbox.lu.x)+box->p.x+5;
+               p[1].y=(min->c.y-dbbox.rl.y)*(box->h-10)/(dbbox.lu.y-dbbox.rl.y)+box->p.y+5;
+               dbg(0,"%d,%d=%d,%d\n",min->c.x, min->c.y, p[1].x,p[1].y);
+               graphics_draw_circle(this->gra, this->foreground, &p[1], 2);
+               if (first)
+                       first=0;
+               else
+                       graphics_draw_lines(this->gra, this->foreground, p, 2);
+               p[0]=p[1];
+               x=min->c.x+1;
+       }
+
+
 }
 
+static void
+gui_internal_cmd2_locale(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
+{
+       struct widget *menu,*wb,*w;
+       char *text;
+
+       graphics_draw_mode(this->gra, draw_mode_begin);
+       menu=gui_internal_menu(this, _("Show Locale"));
+       menu->spx=this->spacing*10;
+       wb=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
+       gui_internal_widget_append(menu, wb);
+       text=g_strdup_printf("LANG=%s",getenv("LANG"));
+       gui_internal_widget_append(wb, w=gui_internal_label_new(this, text));
+       w->flags=gravity_left_center|orientation_horizontal|flags_fill;
+       g_free(text);
+#ifdef HAVE_API_WIN32_BASE
+       {
+               wchar_t wcountry[32],wlang[32];
+               char country[32],lang[32];
+
+               GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVLANGNAME, wlang, sizeof(wlang));
+               WideCharToMultiByte(CP_ACP,0,wlang,-1,lang,sizeof(lang),NULL,NULL);
+               text=g_strdup_printf("LOCALE_SABBREVLANGNAME=%s",lang);
+               gui_internal_widget_append(wb, w=gui_internal_label_new(this, text));
+               w->flags=gravity_left_center|orientation_horizontal|flags_fill;
+               g_free(text);
+               GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVCTRYNAME, wcountry, sizeof(wcountry));
+               WideCharToMultiByte(CP_ACP,0,wcountry,-1,country,sizeof(country),NULL,NULL);
+               text=g_strdup_printf("LOCALE_SABBREVCTRYNAME=%s",country);
+               gui_internal_widget_append(wb, w=gui_internal_label_new(this, text));
+               w->flags=gravity_left_center|orientation_horizontal|flags_fill;
+               g_free(text);
+       }
+#endif
+
+       gui_internal_menu_render(this);
+       graphics_draw_mode(this->gra, draw_mode_end);
+}
 
 
 /**
@@ -3606,23 +5167,23 @@ void gui_internal_cmd_route(struct gui_priv * this, struct widget * wm)
  * @param this The graphics context.
  * @param wm The button widget that was pressed.
  */
-static void gui_internal_table_button_next(struct gui_priv * this, struct widget * wm)
+static void gui_internal_table_button_next(struct gui_priv * this, struct widget * wm, void *data)
 {
        struct widget * table_widget = (struct widget * ) wm->data;
        struct table_data * table_data = NULL;
        int found=0;
        GList * iterator;
-       
+
        if(table_widget)
        {
                table_data = (struct table_data*) table_widget->data;
-               
+
        }
        if(table_data)
        {
                /**
                 * Before advancing to the next page we need to ensure
-                * that the current top_row is in the list of previous top_rows 
+                * that the current top_row is in the list of previous top_rows
                 * so previous page can work.
                 *
                 */
@@ -3634,14 +5195,14 @@ static void gui_internal_table_button_next(struct gui_priv * this, struct widget
                                found=1;
                                break;
                        }
-                       
+
                }
                if( ! found)
                {
                        table_data->page_headers=g_list_append(table_data->page_headers,
                                                               table_data->top_row);
                }
-               
+
                table_data->top_row = g_list_next(table_data->bottom_row);
        }
        wm->state&= ~STATE_HIGHLIGHTED;
@@ -3658,7 +5219,7 @@ static void gui_internal_table_button_next(struct gui_priv * this, struct widget
  * @param this The graphics context.
  * @param wm The button widget that was pressed.
  */
-static void gui_internal_table_button_prev(struct gui_priv * this, struct widget * wm)
+static void gui_internal_table_button_prev(struct gui_priv * this, struct widget * wm, void *data)
 {
        struct widget * table_widget = (struct widget * ) wm->data;
        struct table_data * table_data = NULL;
@@ -3668,9 +5229,9 @@ static void gui_internal_table_button_prev(struct gui_priv * this, struct widget
        if(table_widget)
        {
                table_data = (struct table_data*) table_widget->data;
-               current_page_top = table_data->top_row;
-               if(table_data) 
+               if(table_data)
                {
+                       current_page_top = table_data->top_row;
                        for(iterator = table_data->page_headers; iterator != NULL;
                            iterator = g_list_next(iterator))
                        {
@@ -3705,3 +5266,234 @@ void gui_internal_table_data_free(void * p)
 
 
 }
+
+
+/**
+ * @brief Called when the route is updated.
+ */
+void gui_internal_route_update(struct gui_priv * this, struct navit * navit, struct vehicle *v)
+{
+
+       if(this->route_data.route_showing) {
+               gui_internal_populate_route_table(this,navit);
+               graphics_draw_mode(this->gra, draw_mode_begin);
+               gui_internal_menu_render(this);
+               graphics_draw_mode(this->gra, draw_mode_end);
+       }
+
+
+}
+
+
+/**
+ * @brief Called when the route screen is closed (deallocated).
+ *
+ * The main purpose of this function is to remove the widgets from
+ * references route_data because those widgets are about to be freed.
+ */
+void gui_internal_route_screen_free(struct gui_priv * this_,struct widget * w)
+{
+       if(this_) {
+               this_->route_data.route_showing=0;
+               this_->route_data.route_table=NULL;
+               g_free(w);
+       }
+
+}
+
+/**
+ * @brief Populates the route  table with route information
+ *
+ * @param this The gui context
+ * @param navit The navit object
+ */
+void gui_internal_populate_route_table(struct gui_priv * this,
+                                      struct navit * navit)
+{
+       struct map * map=NULL;
+       struct map_rect * mr=NULL;
+       struct navigation * nav = NULL;
+       struct item * item =NULL;
+       struct attr attr;
+       struct widget * label = NULL;
+       struct widget * row = NULL;
+       nav = navit_get_navigation(navit);
+       if(!nav) {
+               return;
+       }
+       map = navigation_get_map(nav);
+       if(map)
+         mr = map_rect_new(map,NULL);
+       if(mr) {
+               gui_internal_widget_table_clear(this,this->route_data.route_table);
+               while((item = map_rect_get_item(mr))) {
+                       if(item_attr_get(item,attr_navigation_long,&attr)) {
+                         label = gui_internal_label_new(this,attr.u.str);
+                         row = gui_internal_widget_table_row_new(this,
+                                                                 gravity_left
+                                                                 | flags_fill
+                                                                 | orientation_horizontal);
+                         row->children=g_list_append(row->children,label);
+                         gui_internal_widget_append(this->route_data.route_table,row);
+                       }
+
+               }
+
+       }
+}
+
+static struct command_table commands[] = {
+       {"abort_navigation",command_cast(gui_internal_cmd2_abort_navigation)},
+       {"back",command_cast(gui_internal_cmd2_back)},
+       {"back_to_map",command_cast(gui_internal_cmd2_back_to_map)},
+       {"bookmarks",command_cast(gui_internal_cmd2_bookmarks)},
+       {"get_data",command_cast(gui_internal_get_data)},
+       {"locale",command_cast(gui_internal_cmd2_locale)},
+       {"log",command_cast(gui_internal_cmd_log)},
+       {"menu",command_cast(gui_internal_cmd_menu2)},
+       {"position",command_cast(gui_internal_cmd2_position)},
+       {"route_description",command_cast(gui_internal_cmd2_route_description)},
+       {"route_height_profile",command_cast(gui_internal_cmd2_route_height_profile)},
+       {"setting_layout",command_cast(gui_internal_cmd2_setting_layout)},
+       {"setting_maps",command_cast(gui_internal_cmd2_setting_maps)},
+       {"setting_rules",command_cast(gui_internal_cmd2_setting_rules)},
+       {"setting_vehicle",command_cast(gui_internal_cmd2_setting_vehicle)},
+       {"town",command_cast(gui_internal_cmd2_town)},
+       {"quit",command_cast(gui_internal_cmd2_quit)},
+       {"write",command_cast(gui_internal_cmd_write)},
+};
+
+
+//##############################################################################################################
+//# Description:
+//# Comment:
+//# Authors: Martin Schaller (04/2008)
+//##############################################################################################################
+static struct gui_priv * gui_internal_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs, struct gui *gui)
+{
+       struct gui_priv *this;
+       struct attr *attr;
+       *meth=gui_internal_methods;
+       this=g_new0(struct gui_priv, 1);
+       this->nav=nav;
+
+       this->self.type=attr_gui;
+       this->self.u.gui=gui;   
+
+       if ((attr=attr_search(attrs, NULL, attr_menu_on_map_click)))
+               this->menu_on_map_click=attr->u.num;
+       else
+               this->menu_on_map_click=1;
+       if ((attr=attr_search(attrs, NULL, attr_signal_on_map_click)))
+               this->signal_on_map_click=attr->u.num;
+
+       if ((attr=attr_search(attrs, NULL, attr_callback_list))) {
+               command_add_table(attr->u.callback_list, commands, sizeof(commands)/sizeof(struct command_table), this);
+       }
+
+       if( (attr=attr_search(attrs,NULL,attr_font_size)))
+        {
+         this->config.font_size=attr->u.num;
+       }
+       else
+       {
+         this->config.font_size=-1;
+       }
+       if( (attr=attr_search(attrs,NULL,attr_icon_xs)))
+       {
+         this->config.icon_xs=attr->u.num;
+       }
+       else
+       {
+         this->config.icon_xs=-1;
+       }
+       if( (attr=attr_search(attrs,NULL,attr_icon_l)))
+       {
+         this->config.icon_l=attr->u.num;
+       }
+       else
+        {
+         this->config.icon_l=-1;
+       }
+       if( (attr=attr_search(attrs,NULL,attr_icon_s)))
+       {
+         this->config.icon_s=attr->u.num;
+       }
+       else
+        {
+         this->config.icon_s=-1;
+       }
+       if( (attr=attr_search(attrs,NULL,attr_spacing)))
+       {
+         this->config.spacing=attr->u.num;
+       }
+       else
+       {
+         this->config.spacing=-1;
+       }
+       if( (attr=attr_search(attrs,NULL,attr_gui_speech)))
+       {
+         this->speech=attr->u.num;
+       }
+       if( (attr=attr_search(attrs,NULL,attr_keyboard)))
+         this->keyboard=attr->u.num;
+        else
+         this->keyboard=1;
+
+    if( (attr=attr_search(attrs,NULL,attr_fullscreen)))
+      this->fullscreen=attr->u.num;
+
+       if( (attr=attr_search(attrs,NULL,attr_flags)))
+             this->flags=attr->u.num;
+       if( (attr=attr_search(attrs,NULL,attr_background_color)))
+             this->background_color=*attr->u.color;
+       else
+             this->background_color=COLOR_BLACK;
+       if( (attr=attr_search(attrs,NULL,attr_background_color2)))
+               this->background2_color=*attr->u.color;
+       else
+               this->background2_color=(struct color){0x4141,0x4141,0x4141,0xffff};
+       if( (attr=attr_search(attrs,NULL,attr_text_color)))
+             this->text_foreground_color=*attr->u.color;
+       else
+             this->text_foreground_color=COLOR_WHITE;
+       this->text_background_color=COLOR_BLACK;
+       if( (attr=attr_search(attrs,NULL,attr_columns)))
+             this->cols=attr->u.num;
+       if( (attr=attr_search(attrs,NULL,attr_osd_configuration)))
+             this->osd_configuration=*attr;
+
+       if( (attr=attr_search(attrs,NULL,attr_pitch)))
+             this->pitch=attr->u.num;
+       else
+               this->pitch=20;
+       if( (attr=attr_search(attrs,NULL,attr_flags_town)))
+               this->flags_town=attr->u.num;
+       else
+               this->flags_town=-1;
+       if( (attr=attr_search(attrs,NULL,attr_flags_street)))
+               this->flags_street=attr->u.num;
+       else
+               this->flags_street=-1;
+       if( (attr=attr_search(attrs,NULL,attr_flags_house_number)))
+               this->flags_house_number=attr->u.num;
+       else
+               this->flags_house_number=-1;
+       this->data.priv=this;
+       this->data.gui=&gui_internal_methods_ext;
+       this->data.widget=&gui_internal_widget_methods;
+       this->cbl=callback_list_new();
+
+       return this;
+}
+
+//##############################################################################################################
+//# Description:
+//# Comment:
+//# Authors: Martin Schaller (04/2008)
+//##############################################################################################################
+void plugin_init(void)
+{
+       plugin_register_gui_type("internal", gui_internal_new);
+}
+