--- trunk/src/map-tool.c 2009/08/12 12:16:05 51 +++ trunk/src/map-tool.c 2009/11/09 07:50:37 167 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Till Harbaum . + * Copyright (C) 2008-2009 Till Harbaum . * * This file is part of GPXView. * @@ -17,31 +17,35 @@ * along with GPXView. If not, see . */ +/* + * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png 8-15 + * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png 8-15 + */ + +/* + * TODO: + * - draw caches only once + * - prefer duplicates from selected files + * - make semi-transparent caches selectable + */ + #include "gpxview.h" +#include "converter.h" #include // for isnan #ifdef ENABLE_OSM_GPS_MAP #include "osm-gps-map.h" +#include "osm-gps-map-osd-classic.h" #endif -#define GPS_DEFAULT_ZOOM 13 - -/* equatorial radius in meters */ -#define EQ_RADIUS (6378137.0) - -#define RAD2DEG(a) (((a)*180.0)/M_PI) -#define DEG2RAD(a) (((a)*M_PI)/180.0) - -typedef struct { - appdata_t *appdata; - GtkWidget *widget; - GtkWidget *zoomin, *zoomout, *gps; - gint handler_id; - cache_t *press_on; -#if MAEMO_VERSION_MAJOR == 5 - GtkWidget *old_view; +#if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5) +#include +#include #endif -} map_context_t; + +/* default values */ +#define MAP_SOURCE OSM_GPS_MAP_SOURCE_OPENCYCLEMAP +#define GPS_DEFAULT_ZOOM 13 #define PROXY_KEY "/system/http_proxy/" @@ -51,7 +55,7 @@ /* use environment settings if preset */ const char *proxy = g_getenv("http_proxy"); if(proxy) { - printf("http_proxy: %s\n", proxy); + printf("map http proxy from env: %s\n", proxy); return proxy; } @@ -72,6 +76,7 @@ snprintf(proxy_buffer, sizeof(proxy_buffer), "http://%s:%u", host, port); + printf("map http proxy from gconf: %s\n ", proxy_buffer); g_free(host); } @@ -81,74 +86,67 @@ return NULL; } -static void map_zoom(map_context_t *context, int step) { - gint zoom; - OsmGpsMap *map = OSM_GPS_MAP(context->widget); - g_object_get(map, "zoom", &zoom, NULL); - zoom = osm_gps_map_set_zoom(map, zoom+step); - - /* enable/disable zoom buttons as required */ - gtk_widget_set_sensitive(context->zoomin, zoom<17); - gtk_widget_set_sensitive(context->zoomout, zoom>1); - - /* save new zoom */ - context->appdata->map.zoom = zoom; -} - -static gboolean -cb_map_zoomin(GtkButton *button, map_context_t *context) { - map_zoom(context, +1); - return FALSE; -} +static void +cb_map_gps(osd_button_t but, map_context_t *context) { -static gboolean -cb_map_zoomout(GtkButton *button, map_context_t *context) { - map_zoom(context, -1); - return FALSE; -} + if(but == OSD_GPS) { + pos_t *refpos = get_pos(context->appdata); + if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) { + gint zoom; + g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL); + if(zoom < 10) + osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget), + refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM); + else + osm_gps_map_set_center(OSM_GPS_MAP(context->widget), + refpos->lat, refpos->lon); -static gboolean -cb_map_gps(GtkButton *button, map_context_t *context) { - pos_t *refpos = get_pos(context->appdata); - if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) { - osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget), - refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM); - } else { - /* no coordinates given: display the entire world */ - osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget), - 0.0, 0.0, 1); + /* re-enable centering */ + g_object_set(context->widget, "auto-center", TRUE, NULL); + } else { + /* no coordinates given: display the entire world */ + osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget), + 0.0, 0.0, 1); + } } - - return FALSE; } -static GtkWidget -*map_add_button(int icon, GCallback cb, gpointer data, - char *tooltip) { - GtkWidget *button = gtk_button_new(); - gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, icon)); - g_signal_connect(button, "clicked", cb, data); -#ifndef USE_MAEMO - gtk_widget_set_tooltip_text(button, tooltip); -#endif - return button; +static int dist2pixel(map_context_t *context, float km, float lat) { + return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget)); } static gboolean map_gps_update(gpointer data) { map_context_t *context = (map_context_t*)data; + static gboolean goto_is_enabled = FALSE; /* get reference position ... */ pos_t *refpos = get_pos(context->appdata); gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon); /* ... and enable "goto" button if it's valid */ - gtk_widget_set_sensitive(context->gps, ok); + if(ok != goto_is_enabled) { + osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget), + OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context); + goto_is_enabled = ok; + } if(ok) { - float heading = context->appdata->use_gps? - gps_get_heading(context->appdata):NAN; + float heading = NAN; + int radius = 0; + + if(context->appdata->use_gps) { + heading = gps_get_heading(context->appdata); + + /* get error */ + float eph = gps_get_eph(context->appdata); + if(!isnan(eph)) + radius = dist2pixel(context, eph/1000, refpos->lat); + } + + /* TODO: in order to save energy: only draw if state actually changed */ - osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget), + g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL); + osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget), refpos->lat, refpos->lon, heading); } else osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget)); @@ -156,367 +154,249 @@ return TRUE; } -static gboolean on_map_configure(GtkWidget *widget, - GdkEventConfigure *event, - map_context_t *context) { - - /* set default values if they are invalid */ - if(!context->appdata->map.zoom || - isnan(context->appdata->map.pos.lat) || - isnan(context->appdata->map.pos.lon)) { - printf("no valid map position found\n"); - - pos_t *refpos = get_pos(context->appdata); - if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) { - /* use gps position if present */ - context->appdata->map.pos = *refpos; - context->appdata->map.zoom = GPS_DEFAULT_ZOOM; - } else { - /* use world map otherwise */ - context->appdata->map.pos.lat = 0.0; - context->appdata->map.pos.lon = 0.0; - context->appdata->map.zoom = 1; - } - } - - /* jump to initial position */ - osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget), - context->appdata->map.pos.lat, - context->appdata->map.pos.lon, - context->appdata->map.zoom); - - return FALSE; -} +static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) { + GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE, + cache->type); + + /* check if there's also an overwritten coordinate */ + if(cache->notes && cache->notes->override) { + GdkPixbuf *over = icon_get(ICON_MISC, 1); -static void map_draw_cachelist(GtkWidget *map, cache_t *cache) { - while(cache) { - GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type); - osm_gps_map_add_image(OSM_GPS_MAP(map), - cache->pos.lat, cache->pos.lon, icon); + cache->notes->pos.lat, cache->notes->pos.lon, icon); - cache = cache->next; + osm_gps_map_add_image(OSM_GPS_MAP(map), + cache->notes->pos.lat, cache->notes->pos.lon, over); + } else { + if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) + osm_gps_map_add_image(OSM_GPS_MAP(map), + cache->pos.lat, cache->pos.lon, icon); } } -/* draw a nice popup */ -typedef struct { - appdata_t *appdata; - GtkWidget *window; - GMainLoop *loop; -} popup_context_t; - -/* draw shape */ -#define ARROW_BORDER 20 -#define CORNER_RADIUS 10 - -#ifndef USE_MAEMO -#define POPUP_WIDTH 300 -#define POPUP_HEIGHT 100 -#else -#define POPUP_WIDTH 350 -#define POPUP_HEIGHT 120 -#endif - -static gboolean -pointer_in_window(GtkWidget *widget, gint x_root, gint y_root) { - if(GTK_WIDGET_MAPPED(gtk_widget_get_toplevel(widget))) { - gint window_x, window_y; - - gdk_window_get_position(gtk_widget_get_toplevel(widget)->window, - &window_x, &window_y); - - if(x_root >= window_x && x_root < window_x + widget->allocation.width && - y_root >= window_y && y_root < window_y + widget->allocation.height) - return TRUE; +static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches, + GtkWidget *map, gpx_t *gpx, + cache_t *nav, gboolean semi) { + if(!gpx->notes_loaded) { + notes_load_all(appdata, gpx); + gpx->notes_loaded = TRUE; } - - return FALSE; -} - -static gboolean -on_button_press_event(GtkWidget *widget, - GdkEventButton *event, popup_context_t *context) { - gboolean in = pointer_in_window(widget, event->x_root, event->y_root); - printf("overlay button press (in = %d)\n", in); - return !in; -} - -static gboolean -on_button_release_event(GtkWidget *widget, - GdkEventButton *event, popup_context_t *context) { - gboolean in = pointer_in_window(widget, event->x_root, event->y_root); - - printf("overlay button release (in = %d)\n", in); + cache_t *cache = gpx->cache; + while(cache) { + /* search if we have that cache already in our list/displayed */ + int i=0; + while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0)) + i++; + + if(!caches[i].id) { + /* if nav is given draw all other caches semitransparent. */ + /* if nav is not given do what semi sais */ + map_draw_cache(map, cache, nav?(cache != nav):semi); + caches[i].id = cache->id; + } - if(!in) { - printf("destroying popup\n"); - gtk_widget_destroy(gtk_widget_get_toplevel(widget)); + cache = cache->next; } - - return !in; -} - -static void -shutdown_loop(popup_context_t *context) { - if(g_main_loop_is_running(context->loop)) - g_main_loop_quit(context->loop); } -static gint -run_delete_handler(GtkWindow *window, GdkEventAny *event, - popup_context_t *context) { - shutdown_loop(context); - return TRUE; /* Do not destroy */ -} - -static void -run_destroy_handler(GtkWindow *window, popup_context_t *context) { - /* shutdown_loop will be called by run_unmap_handler */ - printf("popup destroyed\n"); -} - -static void -run_unmap_handler(GtkWindow *window, popup_context_t *context) { - shutdown_loop(context); -} - -static void popup_window_shape(GtkWidget *window, int tip_x, int tip_y) { - GdkBitmap *mask = gdk_pixmap_new(NULL, POPUP_WIDTH, POPUP_HEIGHT, 1); - - GdkGC *gc = gdk_gc_new(mask); - GdkColormap *colormap; - GdkColor black; - GdkColor white; - - /* get black/white color values */ - colormap = gdk_colormap_get_system(); - gdk_color_black(colormap, &black); - gdk_color_white(colormap, &white); - - /* erase */ - gdk_gc_set_foreground(gc, &black); - gdk_gc_set_background(gc, &white); - - /* erase background */ - gdk_draw_rectangle(mask, gc, TRUE, 0, 0, POPUP_WIDTH, POPUP_HEIGHT); - - gdk_gc_set_foreground(gc, &white); - gdk_gc_set_background(gc, &black); - - /* the tip is always above or below the "bubble" but never at its side */ - guint tip_offset = (tip_y == 0)?ARROW_BORDER:0; +/* draw geocaches and set window title */ +static void map_setup(map_context_t *context) { + char *name = NULL; - gdk_draw_rectangle(mask, gc, TRUE, - 0, tip_offset + CORNER_RADIUS, - POPUP_WIDTH, - POPUP_HEIGHT - 2*CORNER_RADIUS - ARROW_BORDER); + int cache_num = gpx_total_caches_global(context->appdata->gpx); - gdk_draw_rectangle(mask, gc, TRUE, - CORNER_RADIUS, tip_offset, - POPUP_WIDTH - 2*CORNER_RADIUS, - POPUP_HEIGHT - ARROW_BORDER); - - int off[][2] = { - { CORNER_RADIUS, tip_offset + CORNER_RADIUS }, - { POPUP_WIDTH - CORNER_RADIUS, tip_offset + CORNER_RADIUS }, - { POPUP_WIDTH - CORNER_RADIUS, - POPUP_HEIGHT - CORNER_RADIUS - ARROW_BORDER + tip_offset}, - { CORNER_RADIUS, - POPUP_HEIGHT - CORNER_RADIUS - ARROW_BORDER + tip_offset}}; + if(context->caches_displayed && (cache_num != context->cache_list_len)) { + // printf("re-alloc because %p %d/%d\n", context->caches_displayed, + // cache_num, context->cache_list_len); + g_free(context->caches_displayed); + context->caches_displayed = NULL; + context->cache_list_len = 0; + } + + /* allocate buffer */ + if(cache_num && !context->caches_displayed) { + context->cache_list_len = cache_num; + context->caches_displayed = g_new0(cache_display_t, cache_num+1); + printf("allocated space to handle %d map icons\n", cache_num); + } + + if(!context->appdata->cur_gpx && !context->appdata->cur_cache) { + if(context->state != MAP_ALL) { + printf("map_setup(ALL)\n"); + +#ifdef OSD_NAV + /* no navigation in this mode */ + osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget)); +#endif + + /* clear all existing cache images */ + osm_gps_map_clear_images (OSM_GPS_MAP(context->widget)); + memset(context->caches_displayed, 0, + (cache_num+1) * sizeof(cache_display_t)); + + /* draw all geocaches and none is semi-transparent */ + gpx_t *gpx = context->appdata->gpx; + while(gpx) { + map_draw_gpx(context->appdata, context->caches_displayed, + context->widget, gpx, NULL, FALSE); + gpx = gpx->next; + } + + { + int i=0; + while(context->caches_displayed[i].id) i++; + printf("number of caches actually displayed: %d\n", i); + } - int i; - for(i=0;i<4;i++) { - gdk_draw_arc(mask, gc, TRUE, - off[i][0]-CORNER_RADIUS, off[i][1]-CORNER_RADIUS, - 2*CORNER_RADIUS, 2*CORNER_RADIUS, - 0, 360*64); - } - - GdkPoint points[3] = { {POPUP_WIDTH*1/3, POPUP_HEIGHT/2}, - {POPUP_WIDTH*2/3, POPUP_HEIGHT/2}, - {tip_x,tip_y} }; - gdk_draw_polygon(mask, gc, TRUE, points, 3); + name = g_strdup(_("all")); + context->state = MAP_ALL; + } + } else if(!context->appdata->cur_cache) { + if(context->state != MAP_GPX) { + printf("map_setup(GPX)\n"); + +#ifdef OSD_NAV + /* no navigation in this mode */ + osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget)); +#endif + + /* clear all existing ccahe images */ + osm_gps_map_clear_images (OSM_GPS_MAP(context->widget)); + memset(context->caches_displayed, 0, + (cache_num+1) * sizeof(cache_display_t)); + + /* draw all geocaches and all other gpx files are semi-transparent */ + map_draw_gpx(context->appdata, context->caches_displayed, + context->widget, context->appdata->cur_gpx, NULL, FALSE); + + gpx_t *gpx = context->appdata->gpx; + while(gpx) { + if(gpx != context->appdata->cur_gpx) + map_draw_gpx(context->appdata, context->caches_displayed, + context->widget, gpx, NULL, TRUE); + gpx = gpx->next; + } - gdk_window_shape_combine_mask(window->window, mask, 0, 0); -} + name = g_strdup(context->appdata->cur_gpx->name); + context->state = MAP_GPX; + } + } else { + cache_t *cache = context->appdata->cur_cache; + + printf("map_setup(CACHE)\n"); + + /* no balloons in this mode */ + context->balloon = NULL; + osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget)); + + /* clear all existing ccahe images */ + osm_gps_map_clear_images (OSM_GPS_MAP(context->widget)); + memset(context->caches_displayed, 0, + (cache_num+1) * sizeof(cache_display_t)); + + /* draw all geocaches and all but selected one are semi-transparent */ + gpx_t *gpx = context->appdata->gpx; + while(gpx) { + map_draw_gpx(context->appdata, context->caches_displayed, + context->widget, gpx, cache, FALSE); + gpx = gpx->next; + } -/* create a left aligned label (normal ones are centered) */ -static GtkWidget *gtk_label_left_new(char *str) { - GtkWidget *label = gtk_label_new(str); - gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f); - return label; -} + name = g_strdup(cache->name); + context->state = MAP_CACHE; + + /* navigation in this mode! */ + pos_t cpos = gpx_cache_pos(cache); -/* the small labels are actually only on maemo small */ -#ifdef USE_MAEMO -#define MARKUP_SMALL "%s" -GtkWidget *gtk_label_small_left_new(char *str) { - GtkWidget *label = gtk_label_new(""); - char *markup = g_markup_printf_escaped(MARKUP_SMALL, str); - gtk_label_set_markup(GTK_LABEL(label), markup); - g_free(markup); - gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f); - return label; -} -#define gtk_label_big_left_new(a) gtk_label_left_new(a) +#ifdef OSD_NAV + osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget), + context->appdata->imperial, + cpos.lat, cpos.lon, cache->name); #else -#define gtk_label_small_left_new(a) gtk_label_left_new(a) -#define MARKUP_BIG "%s" -GtkWidget *gtk_label_big_left_new(char *str) { - GtkWidget *label = gtk_label_new(""); - char *markup = g_markup_printf_escaped(MARKUP_BIG, str); - gtk_label_set_markup(GTK_LABEL(label), markup); - g_free(markup); - gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f); - return label; -} +#warning OSD_NAV not defined! #endif - -void cache_popup(map_context_t *mcontext, cache_t *cache) { - popup_context_t pcontext; - pcontext.appdata = mcontext->appdata; - - pcontext.window = gtk_window_new(GTK_WINDOW_POPUP); - gtk_widget_realize(pcontext.window); - gtk_window_set_default_size(GTK_WINDOW(pcontext.window), - POPUP_WIDTH, POPUP_HEIGHT); - gtk_window_resize(GTK_WINDOW(pcontext.window), POPUP_WIDTH, POPUP_HEIGHT); - // gtk_window_set_resizable(GTK_WINDOW(pcontext.window), FALSE); - gtk_window_set_transient_for(GTK_WINDOW(pcontext.window), - GTK_WINDOW(mcontext->appdata->window)); - gtk_window_set_keep_above(GTK_WINDOW(pcontext.window), TRUE); - gtk_window_set_destroy_with_parent(GTK_WINDOW(pcontext.window), TRUE); - gtk_window_set_gravity(GTK_WINDOW(pcontext.window), GDK_GRAVITY_STATIC); - gtk_window_set_modal(GTK_WINDOW(pcontext.window), TRUE); - - /* connect events */ - g_signal_connect(G_OBJECT(pcontext.window), "button-press-event", - G_CALLBACK(on_button_press_event), &pcontext); - g_signal_connect(G_OBJECT(pcontext.window), "button-release-event", - G_CALLBACK(on_button_release_event), &pcontext); - g_signal_connect(G_OBJECT(pcontext.window), "delete-event", - G_CALLBACK(run_delete_handler), &pcontext); - g_signal_connect(G_OBJECT(pcontext.window), "destroy", - G_CALLBACK(run_destroy_handler), &pcontext); - g_signal_connect(G_OBJECT(pcontext.window), "unmap", - G_CALLBACK(run_unmap_handler), &pcontext); - - gdk_pointer_grab(pcontext.window->window, TRUE, - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK, - NULL, NULL, GDK_CURRENT_TIME); - gtk_grab_add(pcontext.window); - - /* check whether cache is in upper or lower half of window */ - gint x, y, sx, sy; - osm_gps_map_geographic_to_screen(OSM_GPS_MAP(mcontext->widget), - cache->pos.lat, cache->pos.lon, - &sx, &sy); - - gdk_window_get_origin(mcontext->widget->window, &x, &y); - - gint ax = 0, ay = 0; - if(sx > mcontext->widget->allocation.width/2) - ax = POPUP_WIDTH; - - if(sy > mcontext->widget->allocation.height/2) - ay = POPUP_HEIGHT; - -#if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5) - GdkColor color; - gdk_color_parse("darkgray", &color); - gtk_widget_modify_bg(GTK_WIDGET(pcontext.window), GTK_STATE_NORMAL, &color); -#endif - - gtk_window_move(GTK_WINDOW(pcontext.window), - x + mcontext->widget->allocation.x + sx - ax, - y + mcontext->widget->allocation.y + sy - ay); - - - GtkWidget *alignment = gtk_alignment_new(0.5, 0.5, 1.0, 1.0); - gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), - CORNER_RADIUS/2 + (ay?0:ARROW_BORDER), - CORNER_RADIUS/2 + (ay?ARROW_BORDER:0), - CORNER_RADIUS, CORNER_RADIUS); - - /* --- actual content ---- */ - GtkWidget *vbox = gtk_vbox_new(FALSE, 0); - - if(cache->id) { - GtkWidget *ihbox = gtk_hbox_new(FALSE, 0); - - gtk_box_pack_start(GTK_BOX(ihbox), - icon_get_widget(ICON_CACHE_TYPE, cache->type), - FALSE, FALSE, 5); - - gtk_box_pack_start_defaults(GTK_BOX(ihbox), - gtk_label_big_left_new(cache->id)); - - gtk_box_pack_start_defaults(GTK_BOX(vbox), ihbox); - } - - if(cache->name) { - GtkWidget *label = gtk_label_small_left_new(cache->name); - gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END); - gtk_box_pack_start_defaults(GTK_BOX(vbox), label); } - GtkWidget *hbox = gtk_hbox_new(FALSE, 0); - if(cache->terrain) { - GtkWidget *ihbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(ihbox), - gtk_label_small_left_new(_("Terrain:")), FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(ihbox), - icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)), - FALSE, FALSE, 5); - gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox); - } - - if(cache->difficulty) { - GtkWidget *ihbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(ihbox), - gtk_label_small_left_new(_("Difficulty:")), FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(ihbox), - icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)), - FALSE, FALSE, 5); - gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox); - } - - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - - gtk_container_add(GTK_CONTAINER(alignment), vbox); - /* ----------------------- */ + if(name) { + char *title = g_strdup_printf(_("Map - %s"), name); + g_free(name); + gtk_window_set_title(GTK_WINDOW(context->window), title); + + g_free(title); + } else + printf("map_setup(keep)\n"); +} - gtk_container_add(GTK_CONTAINER(pcontext.window), alignment); - - /* give window its shape */ - popup_window_shape(pcontext.window, ax, ay); - - gtk_widget_show_all(pcontext.window); - - /* handle this popup until it's gone */ - - pcontext.loop = g_main_loop_new(NULL, FALSE); +static gboolean on_map_configure(GtkWidget *widget, + GdkEventConfigure *event, + map_context_t *context) { - GDK_THREADS_LEAVE(); - g_main_loop_run(pcontext.loop); - GDK_THREADS_ENTER(); + /* for some reason there's a configure event with 1/1 */ + /* on diablo. We just ignore this! */ - g_main_loop_unref(pcontext.loop); + printf("on_map_configure %d %d\n", + widget->allocation.width, + widget->allocation.height); + + if(!context->map_complete && + (widget->allocation.width > 100) && + (widget->allocation.height > 100)) { + + /* setup cache state */ + map_setup(context); + + /* set default values if they are invalid */ + if(!context->appdata->map.zoom || + isnan(context->appdata->map.pos.lat) || + isnan(context->appdata->map.pos.lon)) { + printf("no valid map position found\n"); + + pos_t *refpos = get_pos(context->appdata); + if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) { + printf("use refpos\n"); + + /* use gps position if present */ + context->appdata->map.pos = *refpos; + context->appdata->map.zoom = GPS_DEFAULT_ZOOM; + } else { + printf("use zero pos\n"); + + /* use world map otherwise */ + context->appdata->map.pos.lat = 0.0; + context->appdata->map.pos.lon = 0.0; + context->appdata->map.zoom = 1; + } + } + + /* jump to initial position */ + printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n", + context->appdata->map.pos.lat, + context->appdata->map.pos.lon, + context->appdata->map.zoom); + + osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget), + context->appdata->map.pos.lat, + context->appdata->map.pos.lon, + context->appdata->map.zoom); + context->map_complete = TRUE; + } - printf("cache popup removed\n"); + return FALSE; } static void map_cachelist_nearest(cache_t *cache, pos_t *pos, cache_t **result, float *distance) { + while(cache) { + pos_t cpos = gpx_cache_pos(cache); + float dist = - pow(cache->pos.lat - pos->lat, 2) + - pow(cache->pos.lon - pos->lon, 2); + pow(cpos.lat - pos->lat, 2) + + pow(cpos.lon - pos->lon, 2); if(!(dist > *distance)) { *result = cache; @@ -531,21 +411,18 @@ cache_t *result = NULL; float distance = NAN; -#ifdef USE_MAEMO - if(!context->appdata->cur_gpx) { -#endif + if(!context->appdata->cur_gpx && !context->appdata->cur_cache) { /* search all geocaches */ gpx_t *gpx = context->appdata->gpx; while(gpx) { map_cachelist_nearest(gpx->cache, pos, &result, &distance); gpx = gpx->next; } -#ifdef USE_MAEMO - } else { + } else if(context->appdata->cur_gpx) { map_cachelist_nearest(context->appdata->cur_gpx->cache, pos, &result, &distance); - } -#endif + } else + result = context->appdata->cur_gpx->cache; return result; } @@ -553,33 +430,27 @@ /* translate between osm-gps-map positions and gpxview ones */ pos_t coord2pos(coord_t coo) { pos_t pos; - pos.lat = RAD2DEG(coo.rlat); - pos.lon = RAD2DEG(coo.rlon); + pos.lat = rad2deg(coo.rlat); + pos.lon = rad2deg(coo.rlon); return pos; } -static int dist2pixel(map_context_t *context, float km, float lat) { - gint zoom; - g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL); - - /* world at zoom 1 == 512 pixels */ - float m_per_pix = - cos(DEG2RAD(lat))*2*M_PI*EQ_RADIUS/(1<<(8+zoom)); - - return 1000.0*km/m_per_pix; -} - #define CLICK_FUZZ (24) static gboolean on_map_button_press_event(GtkWidget *widget, GdkEventButton *event, map_context_t *context) { + OsmGpsMap *map = OSM_GPS_MAP(context->widget); + /* check if we actually clicked parts of the OSD */ + if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE) + return FALSE; + /* got a press event without release event? eat it! */ if(context->press_on != NULL) { printf("PRESS: already\n"); - return TRUE; + return FALSE; } pos_t pos = @@ -587,28 +458,253 @@ cache_t *nearest = map_closest(context, &pos); if(nearest) { - float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE); - if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) + pos_t cpos = gpx_cache_pos(nearest); + + float dist = gpx_pos_get_distance(pos, cpos, FALSE); + if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) context->press_on = nearest; } return FALSE; } +static void +cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) { + /* convert the pixbuf into something cairo can handle */ + + // Create a new ImageSurface + cairo_surface_t *image_surface = + cairo_image_surface_create(CAIRO_FORMAT_ARGB32, + gdk_pixbuf_get_width(buf), + gdk_pixbuf_get_height(buf)); + + // Create the new Context for the ImageSurface + g_assert(image_surface); + cairo_t *context = cairo_create(image_surface); + + // Draw the image on the new Context + gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0); + cairo_paint(context); + + // now draw this onto the original context + cairo_set_source_surface(cr, image_surface, x, y); + + cairo_paint(cr); +} + +#ifndef BIG_BALLOONS +#define LINE_SKIP 7 +#else +#define LINE_SKIP 12 +#endif + +static void +balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) { + printf("balloon event: "); + + map_context_t *context = (map_context_t*)data; + cache_t *cache = context->balloon; + + if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) { + printf("draw\n"); + +#if 0 + /* draw pink background to check clipping */ + cairo_rectangle (event->data.draw.cr, + event->data.draw.rect->x-20, event->data.draw.rect->y-20, + event->data.draw.rect->w+40, event->data.draw.rect->h+40); + cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3); + cairo_fill_preserve (event->data.draw.cr); + cairo_set_line_width (event->data.draw.cr, 0); + cairo_stroke (event->data.draw.cr); +#endif + + /* leave a little border top and left */ + gint x = event->data.draw.rect->x, y = event->data.draw.rect->y; + + /* draw the cache type icon ... */ + GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type); + cairo_draw_pixbuf(event->data.draw.cr, icon, x, y); + + if(cache->notes && cache->notes->override) { + GdkPixbuf *over = icon_get(ICON_MISC, 1); + cairo_draw_pixbuf(event->data.draw.cr, over, x, y); + } + + /* ... and right of it the waypoint id */ + cairo_text_extents_t extents; + + if(cache->id) { + cairo_select_font_face (event->data.draw.cr, "Sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_BOLD); + +#ifndef BIG_BALLOONS + cairo_set_font_size (event->data.draw.cr, 20.0); +#else + cairo_set_font_size (event->data.draw.cr, 36.0); +#endif + + cairo_text_extents (event->data.draw.cr, cache->id, &extents); + + /* display id right of icon vertically centered */ + x += gdk_pixbuf_get_width(icon) + 5; + y += (gdk_pixbuf_get_height(icon) + extents.height)/2; + cairo_move_to (event->data.draw.cr, x, y); + cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1); + cairo_show_text (event->data.draw.cr, cache->id); + cairo_stroke (event->data.draw.cr); + + y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP; + } else + y += gdk_pixbuf_get_height(icon); + + /* return to the left border and below icon/text */ + x = event->data.draw.rect->x; + + /* everything from here uses the same font */ + cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); +#ifndef BIG_BALLOONS + cairo_set_font_size (event->data.draw.cr, 14.0); +#else + cairo_set_font_size (event->data.draw.cr, 22.0); +#endif + + if(cache->name) { + /* draw cache name */ + cairo_text_extents (event->data.draw.cr, cache->name, &extents); + y += extents.height; + cairo_move_to (event->data.draw.cr, x, y); + cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1); + cairo_show_text (event->data.draw.cr, cache->name); + cairo_stroke (event->data.draw.cr); + + /* return to the left border and below text */ + y += LINE_SKIP; + x = event->data.draw.rect->x; + } + + if(cache->terrain) { + /* draw cache rating */ + const char *terrain = "Terrain:"; + icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2)); + cairo_text_extents (event->data.draw.cr, _(terrain), &extents); + y += (gdk_pixbuf_get_height(icon) + extents.height)/2; + + /* draw "Terrain:" string */ + cairo_move_to (event->data.draw.cr, x, y); + cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1); + cairo_show_text (event->data.draw.cr, _(terrain)); + cairo_stroke (event->data.draw.cr); + x += extents.width + 2; + + /* draw terrain stars */ + cairo_draw_pixbuf(event->data.draw.cr, icon, x, y - + (gdk_pixbuf_get_height(icon) + extents.height)/2); + + x += gdk_pixbuf_get_width(icon) + LINE_SKIP; + y -= (gdk_pixbuf_get_height(icon) + extents.height)/2; + } + + if(cache->difficulty) { + const char *difficulty = "Difficulty:"; + cairo_text_extents (event->data.draw.cr, _(difficulty), &extents); + y += (gdk_pixbuf_get_height(icon) + extents.height)/2; + + /* draw "Difficulty:" string */ + cairo_move_to (event->data.draw.cr, x, y); + cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1); + cairo_show_text (event->data.draw.cr, _(difficulty)); + cairo_stroke (event->data.draw.cr); + x += extents.width + 2; + + icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2)); + cairo_draw_pixbuf(event->data.draw.cr, icon, x, y - + (gdk_pixbuf_get_height(icon) + extents.height)/2); + } + } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) { + printf("click %s event at %d %d\n", + event->data.click.down?"down":"up", + event->data.click.x, event->data.click.y); + + /* make the main screen jump to that cache */ + if(!event->data.click.down) { + if(context->appdata->cur_cache) { + printf("ERROR: no current cache should be visible!\n"); + } else { + gpx_t *is_in = NULL; + + if(!context->appdata->cur_gpx) { + printf("click while in \"all\" view\n"); + + /* we first need to figure out which gpx file this cache */ + /* is in so we can open it first */ + gpx_t *gpx = context->appdata->gpx; + while(gpx && !is_in) { + cache_t *cur = gpx->cache; + while(cur && !is_in) { + if(cur == cache) + is_in = gpx; + cur = cur->next; + } + gpx = gpx->next; + } + + if(is_in) + gpxlist_goto_cachelist(context->appdata, is_in); + + } else + /* the simple case: there already is an open gpx file and */ + /* we just jump into the "cache" view */ + is_in = context->appdata->cur_gpx; + + if(is_in) { + printf("selecting %s in %s\n", + cache->id, + context->appdata->cur_gpx->name); + + cachelist_goto_cache(context->appdata, cache); + + /* give focus to main screen (important for maemo) */ + printf("raising main window\n"); + gtk_window_present(GTK_WINDOW(context->appdata->window)); + } + } + } + } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) { + printf("removed\n"); + context->balloon = NULL; + } +} + static gboolean on_map_button_release_event(GtkWidget *widget, GdkEventButton *event, map_context_t *context) { OsmGpsMap *map = OSM_GPS_MAP(context->widget); - if(context->press_on) { + /* in "MAP_CACHE" state only one cache is visible */ + /* and the map is in navigation mode. the balloon is */ + /* pretty useless there */ + if(context->press_on && (context->state != MAP_CACHE)) { + + coord_t coo; + coo = osm_gps_map_get_co_ordinates(map, event->x, event->y); + pos_t pos = coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y)); cache_t *nearest = map_closest(context, &pos); if(nearest && nearest == context->press_on) { - float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE); - if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) - cache_popup(context, nearest); + pos_t cpos = gpx_cache_pos(nearest); + + float dist = gpx_pos_get_distance(pos, cpos, FALSE); + if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) { + + context->balloon = nearest; + osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon, + balloon_cb, context); + } } context->press_on = NULL; } else { @@ -622,7 +718,9 @@ return FALSE; } -static void save_map_state(map_context_t *context) { +static void on_window_destroy(GtkWidget *widget, map_context_t *context) { + appdata_t *appdata = context->appdata; + /* save map parameters */ OsmGpsMap *map = OSM_GPS_MAP(context->widget); gint zoom; @@ -633,84 +731,177 @@ g_object_get(map, "latitude", &lat, "longitude", &lon, NULL); context->appdata->map.pos.lat = lat; context->appdata->map.pos.lon = lon; -} - -#if MAEMO_VERSION_MAJOR == 5 -static void on_window_destroy(GtkWidget *widget, map_context_t *context) { - printf("destroy map view\n"); - save_map_state(context); + gint source; + g_object_get(map, "map-source", &source, NULL); + context->appdata->map.source = source; +#if MAEMO_VERSION_MAJOR == 5 /* restore cur_view */ context->appdata->cur_view = context->old_view; +#endif gtk_timeout_remove(context->handler_id); + gps_unregister_callback(appdata, context->cb_id); + + if(context->caches_displayed) { + g_free(context->caches_displayed); + context->caches_displayed = NULL; + } + g_free(context); + appdata->map.context = NULL; } -#endif -void map(appdata_t *appdata) { - map_context_t *context = g_new0(map_context_t, 1); - context->appdata = appdata; - - GtkWidget *hbox = gtk_hbox_new(FALSE, 0); +#if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__) +/* get access to zoom buttons */ +static void +on_window_realize(GtkWidget *widget, gpointer data) { + if (widget->window) { + unsigned char value = 1; + Atom hildon_zoom_key_atom = + gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"), + integer_atom = gdk_x11_get_xatom_by_name("INTEGER"); + Display *dpy = + GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window)); + Window w = GDK_WINDOW_XID(widget->window); - char *path = g_strdup_printf("%s/map/", appdata->image_path); - const char *proxy = get_proxy_uri(appdata); + XChangeProperty(dpy, w, hildon_zoom_key_atom, + integer_atom, 8, PropModeReplace, &value, 1); + } +} +#endif - context->widget = g_object_new(OSM_TYPE_GPS_MAP, - "repo-uri", MAP_SOURCE_OPENSTREETMAP, - "tile-cache", path, - "auto-center", FALSE, - "record-trip-history", FALSE, - "show-trip-history", FALSE, - NULL); +/* on maemo a window is either on top or completely invisible. this */ +/* means that we only need to update the map window if its raised. */ +/* on ordinary desktops this is different and we always update */ - if(proxy) - g_object_set(OSM_GPS_MAP(context->widget), - "proxy-uri", proxy, NULL); +static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event, + gpointer data) { + map_context_t *context = (map_context_t*)data; - g_free(path); + printf("map got focus\n"); - char *name = NULL; #ifdef USE_MAEMO - if(!appdata->cur_gpx) { + /* re-enable refresh of map */ + if(!context->handler_id) + context->handler_id = gtk_timeout_add(1000, map_gps_update, context); #endif - /* draw all geocaches */ - gpx_t *gpx = appdata->gpx; - while(gpx) { - map_draw_cachelist(context->widget, gpx->cache); - gpx = gpx->next; - } - name = g_strdup(_("all geocaches")); + + map_setup(context); + return FALSE; +} + #ifdef USE_MAEMO - } else { - map_draw_cachelist(context->widget, appdata->cur_gpx->cache); - name = g_strdup(appdata->cur_gpx->name); - } +static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event, + gpointer data) { + map_context_t *context = (map_context_t*)data; + + printf("map lost focus\n"); + gtk_timeout_remove(context->handler_id); + context->handler_id = 0; + + return FALSE; +} +#endif + +void map_update(appdata_t *appdata) { + printf("map_update\n"); +#ifndef USE_MAEMO + if(appdata->map.context) + map_setup(appdata->map.context); #endif +} - char *title = g_strdup_printf(_("Map - %s"), name); - g_free(name); +/* callback called by the gps layer whenever gps state changes */ +static void +gps_callback(struct gps_state *state, gpointer data) { + printf("map: gps callback\n"); +} +void map(appdata_t *appdata) { + map_context_t *context = NULL; + + /* if the map window already exists, just raise it */ + if(appdata->map.context) { + printf("using existing map!\n"); + gtk_window_present(GTK_WINDOW(appdata->map.context->window)); + map_setup(appdata->map.context); + return; + } + + context = appdata->map.context = g_new0(map_context_t, 1); + context->appdata = appdata; + context->map_complete = FALSE; + context->state = MAP_NONE; + + /* cleanup old (pre 0.8.7) path if it exists */ + char *old_path = g_strdup_printf("%s/map/", appdata->image_path); + if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) { + printf("old file path %s exists\n", old_path); + rmdir_recursive(old_path); + } + + /* It is recommanded that all applications share these same */ + /* map path, so data is only cached once. The path should be: */ + /* ~/.osm-gps-map on standard PC (users home) */ + /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */ + /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */ +#if !defined(USE_MAEMO) + char *p = getenv("HOME"); + if(!p) p = "/tmp"; + char *path = g_strdup_printf("%s/.osm-gps-map", p); +#else #if MAEMO_VERSION_MAJOR == 5 - GtkWidget *window = hildon_stackable_window_new(); - gtk_window_set_title(GTK_WINDOW(window), title); + char *path = g_strdup("/home/user/.osm-gps-map"); #else - GtkWidget *dialog = gtk_dialog_new_with_buttons(title, - GTK_WINDOW(appdata->window), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, - NULL); + char *path = g_strdup("/media/mmc2/osm-gps-map"); +#endif +#endif -#ifndef USE_MAEMO - gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480); + const char *proxy = get_proxy_uri(appdata); + + gint source = context->appdata->map.source; + if(!source) source = MAP_SOURCE; + + context->widget = g_object_new(OSM_TYPE_GPS_MAP, + "map-source", source, + "tile-cache", path, + "auto-center", FALSE, + "record-trip-history", FALSE, + "show-trip-history", FALSE, + proxy?"proxy-uri":NULL, proxy, + NULL); + + g_free(path); + + osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget)); + +#ifdef USE_MAEMO + /* we don't use a stackable window here on fremantle, since */ + /* this leaves the main window independent from the map and */ + /* the user can e.g. still navigate the main menu */ + context->window = hildon_window_new(); + +#if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__) + g_signal_connect(G_OBJECT(context->window), "realize", + G_CALLBACK(on_window_realize), NULL); +#endif // MAEMO_VERSION #else - gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480); + context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); #endif + +#ifndef USE_MAEMO + gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480); #endif - g_free(title); + g_signal_connect(G_OBJECT(context->widget), "focus-in-event", + G_CALLBACK(on_focus_in), context); + +#ifdef USE_MAEMO + g_signal_connect(G_OBJECT(context->widget), "focus-out-event", + G_CALLBACK(on_focus_out), context); +#endif g_signal_connect(G_OBJECT(context->widget), "configure-event", G_CALLBACK(on_map_configure), context); @@ -721,49 +912,19 @@ g_signal_connect(G_OBJECT(context->widget), "button-release-event", G_CALLBACK(on_map_button_release_event), context); - gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget); - /* zoom button box */ - GtkWidget *vbox = gtk_vbox_new(FALSE,0); - - context->zoomin = - map_add_button(10, G_CALLBACK(cb_map_zoomin), - context, _("Zoom in")); - gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0); - - context->zoomout = - map_add_button(11, G_CALLBACK(cb_map_zoomout), - context, _("Zoom out")); - gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0); - - context->gps = - map_add_button(9, G_CALLBACK(cb_map_gps), - context, _("Jump to GPS position")); - gtk_widget_set_sensitive(context->gps, FALSE); /* install handler for timed updates of the gps button */ context->handler_id = gtk_timeout_add(1000, map_gps_update, context); - gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0); - - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); + context->cb_id = gps_register_callback(appdata, gps_callback, context); #if MAEMO_VERSION_MAJOR == 5 /* prevent some of the main screen things */ context->old_view = appdata->cur_view; appdata->cur_view = NULL; +#endif - g_signal_connect(G_OBJECT(window), "destroy", + g_signal_connect(G_OBJECT(context->window), "destroy", G_CALLBACK(on_window_destroy), context); - gtk_container_add(GTK_CONTAINER(window), hbox); - gtk_widget_show_all(GTK_WIDGET(window)); - -#else - gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); - gtk_widget_show_all(dialog); - gtk_dialog_run(GTK_DIALOG(dialog)); - save_map_state(context); - gtk_timeout_remove(context->handler_id); - gtk_widget_destroy(dialog); - g_free(context); -#endif + gtk_container_add(GTK_CONTAINER(context->window), context->widget); + gtk_widget_show_all(GTK_WIDGET(context->window)); }