Fix:gui_internal:Switch to numeric keyboard for house numbers
[navit-package] / navit / gui / internal / gui_internal.c
index 363517e..cb1733a 100644 (file)
@@ -33,6 +33,9 @@
 #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"
@@ -52,7 +55,7 @@
 #include "vehicle.h"
 #include "vehicleprofile.h"
 #include "window.h"
-#include "main.h"
+#include "config_.h"
 #include "keys.h"
 #include "mapset.h"
 #include "route.h"
@@ -65,6 +68,8 @@
 #include "navigation.h"
 #include "gui_internal.h"
 #include "command.h"
+#include "xmlconfig.h"
+#include "util.h"
 
 struct menu_data {
        struct widget *search_list;
@@ -111,6 +116,7 @@ struct widget {
        char *prefix;
        char *name;
        char *speech;
+       char *command;
        struct pcoord c;
        struct item item;
        int selection_id;
@@ -188,7 +194,7 @@ const int SMALL_PROFILE=2;
  */
 static struct gui_config_settings config_profiles[]={
       {545,32,48,96,10}
-    , {545,32,48,96,5}
+    , {300,32,48,64,3}
       ,{200,16,32,48,2}
 };
 
@@ -205,6 +211,7 @@ struct route_data {
 //##############################################################################################################
 struct gui_priv {
        struct navit *nav;
+       struct attr self;
        struct window *win;
        struct graphics *gra;
        struct graphics_gc *background;
@@ -228,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;
@@ -240,7 +249,7 @@ 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;
 
@@ -256,6 +265,40 @@ struct gui_priv {
        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},
 };
 
 
@@ -341,7 +384,6 @@ 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, 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,void *);
 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, void *data);
 static void gui_internal_table_button_prev(struct gui_priv * this, struct widget * wm, void *data);
@@ -363,11 +405,13 @@ static void gui_internal_search_town(struct gui_priv *this, struct widget *wm, v
 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, 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
@@ -379,42 +423,48 @@ static int gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle
  * * @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 3:
-                       full_name=g_strdup_printf("%s/xpm/%s.svg", getenv("NAVIT_SHAREDIR"), name);
+                       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 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;
@@ -432,35 +482,31 @@ image_new_o(struct gui_priv *this, char *name)
 #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;
@@ -479,6 +525,18 @@ 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)
 {
@@ -812,7 +870,7 @@ 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);
 
@@ -877,9 +935,7 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
        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;
@@ -1003,6 +1059,8 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
                w->w=w->bl+w->br+width;
                w->h=w->bt+w->bb+height;
        }
+       if (expand < 100)
+               expand=100;
 
        /**
         * At this stage the width and height of this
@@ -1155,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)
@@ -1177,7 +1236,7 @@ static void gui_internal_widget_destroy(struct gui_priv *this, struct widget *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) {
@@ -1296,6 +1355,21 @@ gui_internal_cmd_return(struct gui_priv *this, struct widget *wm, void *data)
 }
 
 static void
+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);
@@ -1320,6 +1394,8 @@ gui_internal_top_bar(struct gui_priv *this)
        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|(this->flags & 1 ? 0:flags_fill));
@@ -1484,7 +1560,7 @@ static void gui_internal_apply_config(struct gui_priv *this)
 {
   struct gui_config_settings *  current_config=0;
 
-  dbg(0,"w=%d h=%d\n", this->root.w, this->root.h);
+  dbg(1,"w=%d h=%d\n", this->root.w, this->root.h);
   /**
    * Select default values from profile based on the screen.
    */
@@ -1576,7 +1652,7 @@ gui_internal_button_label(struct gui_priv *this, char *label, int mode)
 
 
 static struct widget *
-gui_internal_menu(struct gui_priv *this, char *label)
+gui_internal_menu(struct gui_priv *this, const char *label)
 {
        struct widget *menu,*w,*w1,*topbox;
 
@@ -1599,7 +1675,7 @@ gui_internal_menu(struct gui_priv *this, char *label)
        w->spx=4*this->spacing;
        w->w=menu->w;
        gui_internal_widget_append(menu, w);
-       if (this->flags & 16) {
+       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);
@@ -1658,9 +1734,9 @@ gui_internal_menu_render(struct gui_priv *this)
 static void
 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, 1);
+       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;
@@ -1675,8 +1751,7 @@ gui_internal_cmd_set_destination(struct gui_priv *this, struct widget *wm, void
 static void
 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);
 }
 
@@ -1718,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, void *data)
+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;
@@ -1801,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}},
@@ -1810,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,
@@ -1823,6 +1899,9 @@ struct selector {
                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, void *data);
@@ -1850,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);
@@ -1865,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;
@@ -1878,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
@@ -1970,12 +2055,59 @@ gui_internal_cmd_view_on_map(struct gui_priv *this, struct widget *wm, void *dat
                graphics_clear_selection(this->gra, NULL);
                graphics_add_selection(this->gra, &w->item, NULL);
        }
-       navit_set_center(this->nav, &w->c);
+       navit_set_center(this->nav, &w->c, 1);
        gui_internal_prune_menu(this, NULL);
 }
 
 
 static void
+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;
@@ -1983,6 +2115,7 @@ gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm, void
        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");
@@ -1997,7 +2130,10 @@ gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm, void
                        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);
                }
        }
@@ -2013,17 +2149,21 @@ gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void
        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);
@@ -2034,55 +2174,40 @@ gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void
        }
 }
 
-/* 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, void *data)
+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);
-       int display_house_numbers=1;
-       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);
        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,
@@ -2090,7 +2215,7 @@ gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data)
                wc->item=wm->item;
                wc->selection_id=wm->selection_id;
        }
-       if (display_house_numbers) {
+       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,
@@ -2098,7 +2223,7 @@ gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data)
                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;
@@ -2122,39 +2247,48 @@ gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data)
                }
                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;
@@ -2210,31 +2344,108 @@ gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data)
                }
                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, 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))) {
@@ -2270,6 +2481,11 @@ gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm, void *data)
                                                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);
                                        }
@@ -2280,7 +2496,20 @@ gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm, void *data)
                }
                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)
@@ -2356,8 +2585,6 @@ gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *se
        struct widget *wc;
        struct item *item=NULL;
        GList *l;
-       static int cpt_res = 0;
-       cpt_res ++;
        static char possible_keys[256]="";
 
        res=search_list_get_result(this->sl);
@@ -2388,10 +2615,9 @@ gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *se
 
        if (! res) {
                gui_internal_search_idle_end(this);
-               cpt_res = 0;
 
                struct menu_data *md=gui_internal_menu_data(this);
-               if (md && md->keyboard) {
+               if (md && md->keyboard && !(this->flags & 2048)) {
                        GList *lk=md->keyboard->children;
                        graphics_draw_mode(this->gra, draw_mode_begin);
                        while (lk) {
@@ -2427,20 +2653,26 @@ gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *se
                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;
                item=&res->town->common.item;
                if (res->town->name && res->town->district)
-                       text=g_strdup_printf("%s%s%s (%s)", res->town->common.postal_mask ? res->town->common.postal_mask : "", res->town->common.postal_mask ? " ":"", 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", res->town->common.postal ? res->town->common.postal_mask : "", res->town->common.postal_mask ? " ":"", res->town->name);
+                       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 (! 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);
-       if (cpt_res <= 2) {
                gui_internal_widget_append(search_list,
                                wc=gui_internal_button_new_with_callback(this, text,
                                        image_new_xs(this, res->country->flag),
@@ -2457,7 +2689,6 @@ gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *se
                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);
 }
 
@@ -2485,10 +2716,12 @@ gui_internal_search_changed(struct gui_priv *this, struct widget *wm, void *data
 
        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);
@@ -2522,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;
 }
@@ -2544,7 +2777,7 @@ 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) {
@@ -2647,7 +2880,7 @@ gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode)
                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();
+               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;
@@ -2742,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);
@@ -2755,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;
@@ -2778,6 +3018,7 @@ 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_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) {
@@ -2793,7 +3034,7 @@ 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,2));
+               gui_internal_widget_append(w, gui_internal_keyboard(this,keyboard_mode));
        gui_internal_menu_render(this);
 }
 
@@ -2861,7 +3102,7 @@ gui_internal_search_country(struct gui_priv *this, struct widget *widget, void *
 }
 
 static void
-gui_internal_cmd_town(struct gui_priv *this, struct widget *wm, void *data)
+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);
@@ -2869,7 +3110,7 @@ gui_internal_cmd_town(struct gui_priv *this, struct widget *wm, void *data)
 }
 
 static void
-gui_internal_cmd_layout(struct gui_priv *this, struct widget *wm, void *data)
+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;
@@ -2891,134 +3132,31 @@ gui_internal_cmd_layout(struct gui_priv *this, struct widget *wm, void *data)
 }
 
 static void
-gui_internal_cmd_fullscreen(struct gui_priv *this, struct widget *wm, void *data)
-{
-       graphics_draw_mode(this->gra, draw_mode_end);
-       this->fullscreen=!this->fullscreen;
-       this->win->fullscreen(this->win, this->fullscreen);
-       graphics_draw_mode(this->gra, draw_mode_begin);
-}
-
-static void
-gui_internal_cmd_2d(struct gui_priv *this, struct widget *wm, void *data)
-{
-       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, void *data)
-{
-       struct transformation *trans=navit_get_trans(this->nav);
-       transform_set_pitch(trans, this->pitch);
-       this->redraw=1;
-}
-
-static void
-gui_internal_cmd_display(struct gui_priv *this, struct widget *wm, void *data)
+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, void *data)
+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, void *data)
+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, 0);
 }
 
 
 static void
-gui_internal_cmd_actions(struct gui_priv *this, struct widget *wm, void *data)
-{
-       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, void *wdata)
+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;
@@ -3077,10 +3215,10 @@ gui_internal_cmd_show_satellite_status(struct gui_priv *this, struct widget *wm,
        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(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);
@@ -3140,6 +3278,28 @@ gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle
        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.
@@ -3165,16 +3325,19 @@ gui_internal_cmd_set_active_profile(struct gui_priv *this, struct
 
        // Change the profile name
        struct attr profilename_attr = {attr_profilename, {profilename}};
-       if(!vehicle_set_attr(v, &profilename_attr, NULL)) {
+       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 = {attr_vehicle, {v}};
-        navit_set_attr(this->nav, &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);
 }
 
 /**
@@ -3195,9 +3358,9 @@ gui_internal_add_vehicle_profile(struct gui_priv *this, struct widget
        int active;
        struct vehicle_and_profilename *context = NULL;
 
-       static char *__profile_translations[] = {
-               _n("car"), _n("bike"), _n("pedestrian")
-       };
+#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);
@@ -3281,7 +3444,7 @@ gui_internal_cmd_vehicle_settings(struct gui_priv *this, struct widget *wm, void
 }
 
 static void
-gui_internal_cmd_vehicle(struct gui_priv *this, struct widget *wm, void *data)
+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;
@@ -3310,7 +3473,7 @@ gui_internal_cmd_vehicle(struct gui_priv *this, struct widget *wm, void *data)
 
 
 static void
-gui_internal_cmd_rules(struct gui_priv *this, struct widget *wm, void *data)
+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;
@@ -3332,44 +3495,19 @@ gui_internal_cmd_rules(struct gui_priv *this, struct widget *wm, void *data)
                        &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, void *data)
-{
-       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:
-//# Authors: Martin Schaller (04/2008)
-//##############################################################################################################
-static void gui_internal_motion(void *data, struct point *p)
+//##############################################################################################################
+//# Description:
+//# Comment:
+//# Authors: Martin Schaller (04/2008)
+//##############################################################################################################
+static void gui_internal_motion(void *data, struct point *p)
 {
 
        struct gui_priv *this=data;
@@ -3386,39 +3524,217 @@ static void gui_internal_motion(void *data, struct point *p)
                this->motion_timeout_event=event_add_timeout(100,0, this->motion_timeout_callback);
 }
 
+static const char *
+find_attr(const char **names, const char **values, const char *name)
+{
+       while (*names) {
+               if (!strcasecmp(*names, name))
+                       return *values;
+               names+=xml_attr_distance;
+               values+=xml_attr_distance;
+       }
+       return NULL;
+}
 
-static void gui_internal_menu_root(struct gui_priv *this)
+static char *
+find_attr_dup(const char **names, const char **values, const char *name)
 {
-       struct widget *w;
+       return g_strdup(find_attr(names, values, name));
+}
 
-       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));
-       if (this->flags & 2) {
-               gui_internal_widget_append(w, gui_internal_button_new_with_callback(this, _("Show\nMap"),
-                               image_new_l(this, "gui_map"), gravity_center|orientation_vertical,
-                               gui_internal_cmd_settings, NULL));
+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);
        }
-       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));
+}
 
-       gui_internal_widget_append(w, gui_internal_button_new_with_callback(this, "Route",
-                       image_new_l(this, "gui_settings"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_route, NULL));
 
+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;
 
-       callback_list_call_attr_1(this->cbl, attr_gui, w);
+       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);
+       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_enter(struct gui_priv *this, int ignore)
 {
@@ -3444,20 +3760,30 @@ 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;
@@ -3550,6 +3876,95 @@ 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:
@@ -3562,13 +3977,26 @@ static void gui_internal_button(void *data, int pressed, int button, struct poin
 
        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
+               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)
+               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;
        }
 
@@ -3590,6 +4018,29 @@ 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:
@@ -3598,15 +4049,18 @@ static void gui_internal_button(void *data, int pressed, int button, struct poin
 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;
-       dbg(0,"w=%d h=%d children=%p\n", w, h, this->root.children);
+       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);
        }
@@ -3724,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);
@@ -3748,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;
                }
@@ -3767,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);
@@ -3789,8 +4246,6 @@ static void gui_internal_keypress(void *data, char *key)
 static int gui_internal_set_graphics(struct gui_priv *this, struct graphics *gra)
 {
        struct window *win;
-       struct color cbh={0x9fff,0x9fff,0x9fff,0xffff};
-       struct color cf={0xbfff,0xbfff,0xbfff,0xffff};
        struct transformation *trans=navit_get_trans(this->nav);
 
        win=graphics_get_data(gra, "window");
@@ -3809,22 +4264,15 @@ 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);
-       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);
+       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;
 }
 
@@ -3847,6 +4295,9 @@ struct gui_methods gui_internal_methods = {
        NULL,
        NULL,
        gui_internal_disable_suspend,
+       gui_internal_get_attr,
+       gui_internal_add_attr,
+       gui_internal_set_attr,
 };
 
 static void
@@ -3939,127 +4390,28 @@ static struct gui_internal_widget_methods gui_internal_widget_methods = {
        gui_internal_set_default_background,
 };
 
-static struct command_table commands[] = {
-       {"menu",command_cast(gui_internal_cmd_menu2)},
-       {"fullscreen",command_cast(gui_internal_cmd_fullscreen)},
-       {"get_data",command_cast(gui_internal_get_data)},
-       {"log",command_cast(gui_internal_cmd_log)},
-};
-
-
-//##############################################################################################################
-//# 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_cmd_write(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
-       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;
-       if ((attr=attr_search(attrs, NULL, attr_callback_list))) {
-               dbg(0,"register\n");
-               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;
+       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;
        }
-       else
-       {
-         this->config.spacing=-1;
+       if (ATTR_IS_COORD_GEO(in[0]->type)) {
+               str=str2=coordinates_geo(in[0]->u.coord_geo, '\n');
        }
-       if( (attr=attr_search(attrs,NULL,attr_gui_speech)))
-       {
-         this->speech=attr->u.num;
+       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);
        }
-       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=(struct color){0x0,0x0,0x0,0xffff};
-       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=(struct color){0xffff,0xffff,0xffff,0xffff};
-       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;
-       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;
+       g_free(str);
+       g_free(str2);
 }
 
-//##############################################################################################################
-//# Description:
-//# Comment:
-//# Authors: Martin Schaller (04/2008)
-//##############################################################################################################
-void plugin_init(void)
-{
-       plugin_register_gui_type("internal", gui_internal_new);
-}
 
 /**
  * @brief Creates a new table widget.
@@ -4488,7 +4840,7 @@ void gui_internal_table_render(struct gui_priv * this, struct widget * w)
  * @param v Unused
  */
 static void
-gui_internal_cmd_route_description(struct gui_priv * this, struct widget * wm,void *v)
+gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
 
 
@@ -4512,7 +4864,7 @@ gui_internal_cmd_route_description(struct gui_priv * this, struct widget * wm,vo
        row = gui_internal_widget_table_row_new(this,gravity_left | orientation_horizontal | flags_fill);
 
 
-       menu=gui_internal_menu(this,"Route Description");
+       menu=gui_internal_menu(this,_("Route Description"));
 
        menu->free=gui_internal_route_screen_free;
        this->route_data.route_showing=1;
@@ -4611,7 +4963,8 @@ item_get_heightline(struct item *item)
  * @param wm The button that was pressed.
  * @param v Unused
  */
-static void gui_internal_cmd_route_height_profile(struct gui_priv * this, struct widget * wm,void *v)
+static void
+gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
 
 
@@ -4766,34 +5119,46 @@ static void gui_internal_cmd_route_height_profile(struct gui_priv * this, struct
 
 }
 
-/**
- * @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,void *v)
+static void
+gui_internal_cmd2_locale(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
-       struct widget *w;
+       struct widget *menu,*wb,*w;
+       char *text;
 
        graphics_draw_mode(this->gra, draw_mode_begin);
-       w=gui_internal_menu(this, _("Route"));
-       w->spx=this->spacing*10;
-       gui_internal_widget_append(w, gui_internal_button_new_with_callback(this, _("Description"),
-                       image_new_l(this, "gui_actions"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_route_description, NULL));
-       gui_internal_widget_append(w, gui_internal_button_new_with_callback(this, _("Height Profile"),
-                       image_new_l(this, "gui_actions"), gravity_center|orientation_vertical,
-                       gui_internal_cmd_route_height_profile, NULL));
-       gui_internal_menu_render(this);
+       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);
-
 }
 
 
-
 /**
  * @brief handles the 'next page' table event.
  * A callback function that is invoked when the 'next page' button is pressed
@@ -4976,3 +5341,159 @@ void gui_internal_populate_route_table(struct gui_priv * this,
 
        }
 }
+
+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);
+}
+