Diff of /trunk/src/map-tool.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 56 by harbaum, Fri Aug 14 12:19:45 2009 UTC revision 144 by harbaum, Tue Oct 27 08:38:31 2009 UTC
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /*
21     * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
22     * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23     */
24    
25  #include "gpxview.h"  #include "gpxview.h"
26    #include "converter.h"
27  #include <math.h>    // for isnan  #include <math.h>    // for isnan
28    
29  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
30  #include "osm-gps-map.h"  #include "osm-gps-map.h"
31    #include "osm-gps-map-osd-classic.h"
32  #endif  #endif
33    
34  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35  #define GPS_DEFAULT_ZOOM 13  #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
37  /* equatorial radius in meters */  #endif
 #define EQ_RADIUS     (6378137.0)  
38    
39  #define RAD2DEG(a)  (((a)*180.0)/M_PI)  /* default values */
40  #define DEG2RAD(a)  (((a)*M_PI)/180.0)  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41    #define GPS_DEFAULT_ZOOM 13
42    
43  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
44    
# Line 71  static const char *get_proxy_uri(appdata Line 78  static const char *get_proxy_uri(appdata
78    return NULL;    return NULL;
79  }  }
80    
81  static void map_zoom(map_context_t *context, int step) {  static void
82    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
   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 < osm_gps_map_source_get_max_zoom(MAP_SOURCE));  
   gtk_widget_set_sensitive(context->zoomout,  
            zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));  
   
   /* hmm ... this doesn't really work */  
   osm_gps_map_osd_speed(map, zoom);  
   
   /* 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;  
 }  
83    
84  static gboolean    if(but == OSD_GPS) {
85  cb_map_zoomout(GtkButton *button, map_context_t *context) {      pos_t *refpos = get_pos(context->appdata);
86    map_zoom(context, -1);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
87    return FALSE;        gint zoom;
88  }        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
89          if(zoom < 10)
90            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
91                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
92          else
93            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
94                                   refpos->lat, refpos->lon);
95    
96  static gboolean        /* re-enable centering */
97  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
98    pos_t *refpos = get_pos(context->appdata);      } else {
99    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
100      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
101                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
102    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
103    }    }
   
   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;  
104  }  }
105    
106  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 141  static gboolean map_gps_update(gpointer Line 115  static gboolean map_gps_update(gpointer
115    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
116    
117    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
118    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
119                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
120    
121    if(ok) {    if(ok) {
122      float heading = NAN;      float heading = NAN;
# Line 165  static gboolean map_gps_update(gpointer Line 140  static gboolean map_gps_update(gpointer
140    return TRUE;    return TRUE;
141  }  }
142    
143  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache) {
144                                   GdkEventConfigure *event,    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
                                  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;  
     }  
   }  
145    
146    /* jump to initial position */    /* check if there's also an overwritten coordinate */
147    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),    if(cache->notes && cache->notes->override) {
148                              context->appdata->map.pos.lat,      GdkPixbuf *over = icon_get(ICON_MISC, 1);
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
   
   return FALSE;  
 }  
149    
 static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  
   while(cache) {  
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   
150      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
151                            cache->pos.lat, cache->pos.lon, icon);            cache->notes->pos.lat, cache->notes->pos.lon, icon);
152    
153      cache = cache->next;      osm_gps_map_add_image(OSM_GPS_MAP(map),
154              cache->notes->pos.lat, cache->notes->pos.lon, over);
155      } else {
156        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
157          osm_gps_map_add_image(OSM_GPS_MAP(map),
158                                cache->pos.lat, cache->pos.lon, icon);
159    }    }
160  }  }
161    
162  /* draw a nice popup */  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
163  typedef struct {    if(!gpx->notes_loaded) {
164    appdata_t *appdata;      notes_load_all(appdata, gpx);
165    GtkWidget *window;      gpx->notes_loaded = TRUE;
   GMainLoop *loop;  
   cache_t *cache;  
 } 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  360  
 #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;  
166    }    }
   
   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);  
167    
168    if(!in) {    cache_t *cache = gpx->cache;
169      printf("destroying popup\n");    while(cache) {
170      gtk_widget_destroy(gtk_widget_get_toplevel(widget));      map_draw_cache(map, cache);
171        cache = cache->next;
172    }    }
   
   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);  
173  }  }
174    
175  static void popup_window_shape(GtkWidget *window, int tip_x, int tip_y) {  /* draw geocaches and set window title */
176    GdkBitmap *mask = gdk_pixmap_new(NULL, POPUP_WIDTH, POPUP_HEIGHT, 1);  static void map_setup(map_context_t *context) {
177      char *name = NULL;
   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;  
   
   gdk_draw_rectangle(mask, gc, TRUE,  
                      0, tip_offset + CORNER_RADIUS,  
                      POPUP_WIDTH,  
                      POPUP_HEIGHT - 2*CORNER_RADIUS - ARROW_BORDER);  
   
   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}};  
   
   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);  
   
   
   gdk_window_shape_combine_mask(window->window, mask, 0, 0);  
 }  
178    
179  /* create a left aligned label (normal ones are centered) */    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
180  static GtkWidget *gtk_label_left_new(char *str) {      if(context->state != MAP_ALL) {
181    GtkWidget *label = gtk_label_new(str);        printf("map_setup(ALL)\n");
182    gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
183    return label;  #ifdef OSD_NAV
184  }        /* no navigation in this mode */
185          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
186    #endif
187    
188          /* clear all existing ccahe images */
189          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
190    
191          /* draw all geocaches */
192          gpx_t *gpx = context->appdata->gpx;
193          while(gpx) {
194            map_draw_gpx(context->appdata, context->widget, gpx);
195            gpx = gpx->next;
196          }
197          name = g_strdup(_("all"));
198          context->state = MAP_ALL;
199        }
200      } else if(!context->appdata->cur_cache) {
201        if(context->state != MAP_GPX) {
202          printf("map_setup(GPX)\n");
203    
204    #ifdef OSD_NAV
205          /* no navigation in this mode */
206          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
207    #endif
208    
209          /* clear all existing ccahe images */
210          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
211    
212          map_draw_gpx(context->appdata, context->widget,
213                       context->appdata->cur_gpx);
214          name = g_strdup(context->appdata->cur_gpx->name);
215          context->state = MAP_GPX;
216        }
217      } else {
218        cache_t *cache = context->appdata->cur_cache;
219    
220        printf("map_setp(CACHE)\n");
221    
222        /* no balloons in this mode */
223        context->balloon = NULL;
224        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
225    
226        /* clear all existing ccahe images */
227        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
228    
229        map_draw_cache(context->widget, cache);
230        name = g_strdup(cache->name);
231        context->state = MAP_CACHE;
232    
233        /* navigation in this mode! */
234        pos_t cpos = gpx_cache_pos(cache);
235    
236  /* the small labels are actually only on maemo small */  #ifdef OSD_NAV
237  #ifdef USE_MAEMO      osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
238  #define MARKUP_SMALL "<span size='small'>%s</span>"                                context->appdata->imperial,
239  GtkWidget *gtk_label_small_left_new(char *str) {                                cpos.lat, cpos.lon, cache->name);
   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)  
240  #else  #else
241  #define gtk_label_small_left_new(a) gtk_label_left_new(a)  #warning OSD_NAV not defined!
 #define MARKUP_BIG "<span size='x-large'>%s</span>"  
 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;  
 }  
 #endif  
   
 static gboolean  
 on_cache_button_clicked(GtkButton *button, popup_context_t *context) {  
   printf("clicked %s\n", context->cache->name);  
   return FALSE;  
 }  
   
 void cache_popup(map_context_t *mcontext, cache_t *cache) {  
   popup_context_t pcontext;  
   pcontext.appdata = mcontext->appdata;  
   pcontext.cache = cache;  
   
   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);  
   GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  
   
   gtk_box_pack_start(GTK_BOX(hbox),  
                      icon_get_widget(ICON_CACHE_TYPE, cache->type),  
                      FALSE, FALSE, 5);  
   
   if(cache->id)  
     gtk_box_pack_start_defaults(GTK_BOX(hbox),  
                                 gtk_label_big_left_new(cache->id));  
   
 #if 0  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, 12));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(on_cache_button_clicked), &pcontext);  
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);  
242  #endif  #endif
   
   gtk_box_pack_start_defaults(GTK_BOX(vbox), hbox);  
   
   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);  
   }  
   
   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);  
243    }    }
244    
245    if(cache->difficulty) {    if(name) {
246      GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);      char *title = g_strdup_printf(_("Map - %s"), name);
247      gtk_box_pack_start(GTK_BOX(ihbox),      g_free(name);
        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);  
   /* ----------------------- */  
   
248    
249    gtk_container_add(GTK_CONTAINER(pcontext.window), alignment);      gtk_window_set_title(GTK_WINDOW(context->window), title);
250    
251    /* give window its shape */      g_free(title);
252    popup_window_shape(pcontext.window, ax, ay);    } else
253        printf("map_setup(keep)\n");
254    gtk_widget_show_all(pcontext.window);  }
255    
256    /* handle this popup until it's gone */  static gboolean on_map_configure(GtkWidget *widget,
257                                     GdkEventConfigure *event,
258    pcontext.loop = g_main_loop_new(NULL, FALSE);                                   map_context_t *context) {
259    
260    GDK_THREADS_LEAVE();    /* for some reason there's a configure event with 1/1 */
261    g_main_loop_run(pcontext.loop);    /* on diablo. We just ignore this! */
   GDK_THREADS_ENTER();  
262    
263    g_main_loop_unref(pcontext.loop);    printf("on_map_configure %d %d\n",
264             widget->allocation.width,
265             widget->allocation.height);
266    
267      if(!context->map_complete &&
268         (widget->allocation.width > 100) &&
269         (widget->allocation.height > 100)) {
270    
271        /* setup cache state */
272        map_setup(context);
273    
274        /* set default values if they are invalid */
275        if(!context->appdata->map.zoom ||
276           isnan(context->appdata->map.pos.lat) ||
277           isnan(context->appdata->map.pos.lon)) {
278          printf("no valid map position found\n");
279    
280          pos_t *refpos = get_pos(context->appdata);
281          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
282            printf("use refpos\n");
283    
284            /* use gps position if present */
285            context->appdata->map.pos = *refpos;
286            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
287          } else {
288            printf("use zero pos\n");
289    
290            /* use world map otherwise */
291            context->appdata->map.pos.lat = 0.0;
292            context->appdata->map.pos.lon = 0.0;
293            context->appdata->map.zoom = 1;
294          }
295        }
296    
297        /* jump to initial position */
298        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
299               context->appdata->map.pos.lat,
300               context->appdata->map.pos.lon,
301               context->appdata->map.zoom);
302    
303        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
304                                  context->appdata->map.pos.lat,
305                                  context->appdata->map.pos.lon,
306                                  context->appdata->map.zoom);
307        context->map_complete = TRUE;
308      }
309    
310    printf("cache popup removed\n");    return FALSE;
311  }  }
312    
313  static void  static void
314  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
315                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
316    
317    while(cache) {    while(cache) {
318        pos_t cpos = gpx_cache_pos(cache);
319    
320      float dist =      float dist =
321        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
322        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
323    
324      if(!(dist > *distance)) {      if(!(dist > *distance)) {
325        *result = cache;        *result = cache;
# Line 554  static cache_t *map_closest(map_context_ Line 334  static cache_t *map_closest(map_context_
334    cache_t *result = NULL;    cache_t *result = NULL;
335    float distance = NAN;    float distance = NAN;
336    
337  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
338      /* search all geocaches */      /* search all geocaches */
339      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
340      while(gpx) {      while(gpx) {
341        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
342        gpx = gpx->next;        gpx = gpx->next;
343      }      }
344  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
345      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
346                            pos, &result, &distance);                            pos, &result, &distance);
347    }    } else
348  #endif      result = context->appdata->cur_gpx->cache;
349    
350    return result;    return result;
351  }  }
# Line 576  static cache_t *map_closest(map_context_ Line 353  static cache_t *map_closest(map_context_
353  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
354  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
355    pos_t pos;    pos_t pos;
356    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
357    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
358    return pos;    return pos;
359  }  }
360    
# Line 586  pos_t coord2pos(coord_t coo) { Line 363  pos_t coord2pos(coord_t coo) {
363  static gboolean  static gboolean
364  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
365                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
366    
367    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
368    
369      /* check if we actually clicked parts of the OSD */
370      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
371        return FALSE;
372    
373    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
374    if(context->press_on != NULL) {    if(context->press_on != NULL) {
375      printf("PRESS: already\n");      printf("PRESS: already\n");
376      return TRUE;      return FALSE;
377    }    }
378    
379    pos_t pos =    pos_t pos =
# Line 599  on_map_button_press_event(GtkWidget *wid Line 381  on_map_button_press_event(GtkWidget *wid
381    
382    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
383    if(nearest) {    if(nearest) {
384      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
385      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
386        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
387        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
388        context->press_on = nearest;        context->press_on = nearest;
389    }    }
390    
391    return FALSE;    return FALSE;
392  }  }
393    
394    static void
395    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
396      /* convert the pixbuf into something cairo can handle */
397    
398      // Create a new ImageSurface
399      cairo_surface_t *image_surface =
400        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
401                                   gdk_pixbuf_get_width(buf),
402                                   gdk_pixbuf_get_height(buf));
403    
404      // Create the new Context for the ImageSurface
405      cairo_t *context = cairo_create(image_surface);
406    
407      // Draw the image on the new Context
408      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
409      cairo_paint(context);
410    
411      // now draw this onto the original context
412      cairo_set_source_surface(cr, image_surface, x, y);
413    
414      cairo_paint(cr);
415    }
416    
417    #ifndef BIG_BALLOONS
418    #define LINE_SKIP  7
419    #else
420    #define LINE_SKIP  12
421    #endif
422    
423    static void
424    balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
425      printf("balloon event: ");
426    
427      map_context_t *context = (map_context_t*)data;
428      cache_t *cache = context->balloon;
429    
430      if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
431        printf("draw\n");
432    
433    #if 0
434        /* draw pink background to check clipping */
435        cairo_rectangle (event->data.draw.cr,
436                         event->data.draw.rect->x-20, event->data.draw.rect->y-20,
437                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
438        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
439        cairo_fill_preserve (event->data.draw.cr);
440        cairo_set_line_width (event->data.draw.cr, 0);
441        cairo_stroke (event->data.draw.cr);
442    #endif
443    
444        /* leave a little border top and left */
445        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
446    
447        /* draw the cache type icon ... */
448        GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
449        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
450    
451        if(cache->notes && cache->notes->override) {
452          GdkPixbuf *over = icon_get(ICON_MISC, 1);
453          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
454        }
455    
456        /* ... and right of it the waypoint id */
457        cairo_text_extents_t extents;
458    
459        if(cache->id) {
460          cairo_select_font_face (event->data.draw.cr, "Sans",
461                                  CAIRO_FONT_SLANT_NORMAL,
462                                  CAIRO_FONT_WEIGHT_BOLD);
463    
464    #ifndef BIG_BALLOONS
465          cairo_set_font_size (event->data.draw.cr, 20.0);
466    #else
467          cairo_set_font_size (event->data.draw.cr, 36.0);
468    #endif
469    
470          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
471    
472          /* display id right of icon vertically centered */
473          x += gdk_pixbuf_get_width(icon) + 5;
474          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
475          cairo_move_to (event->data.draw.cr, x, y);
476          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
477          cairo_show_text (event->data.draw.cr, cache->id);
478          cairo_stroke (event->data.draw.cr);
479    
480          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
481        } else
482          y += gdk_pixbuf_get_height(icon);
483    
484        /* return to the left border and below icon/text */
485        x = event->data.draw.rect->x;
486    
487        /* everything from here uses the same font */
488        cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
489                                CAIRO_FONT_WEIGHT_NORMAL);
490    #ifndef BIG_BALLOONS
491        cairo_set_font_size (event->data.draw.cr, 14.0);
492    #else
493        cairo_set_font_size (event->data.draw.cr, 22.0);
494    #endif
495    
496        if(cache->name) {
497          /* draw cache name */
498          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
499          y += extents.height;
500          cairo_move_to (event->data.draw.cr, x, y);
501          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
502          cairo_show_text (event->data.draw.cr, cache->name);
503          cairo_stroke (event->data.draw.cr);
504    
505          /* return to the left border and below text */
506          y += LINE_SKIP;
507          x = event->data.draw.rect->x;
508        }
509    
510        if(cache->terrain) {
511          /* draw cache rating */
512          const char *terrain = "Terrain:";
513          icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
514          cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
515          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
516    
517          /* draw "Terrain:" string */
518          cairo_move_to (event->data.draw.cr, x, y);
519          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
520          cairo_show_text (event->data.draw.cr, _(terrain));
521          cairo_stroke (event->data.draw.cr);
522          x += extents.width + 2;
523    
524          /* draw terrain stars */
525          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
526                            (gdk_pixbuf_get_height(icon) + extents.height)/2);
527    
528          x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
529        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
530        }
531    
532        if(cache->difficulty) {
533          const char *difficulty = "Difficulty:";
534          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
535          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
536    
537          /* draw "Difficulty:" string */
538          cairo_move_to (event->data.draw.cr, x, y);
539          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
540          cairo_show_text (event->data.draw.cr, _(difficulty));
541          cairo_stroke (event->data.draw.cr);
542          x += extents.width + 2;
543    
544          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
545          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
546                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
547        }
548      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
549        printf("click %s event at %d %d\n",
550               event->data.click.down?"down":"up",
551               event->data.click.x, event->data.click.y);
552    
553        /* make the main screen jump to that cache */
554        if(!event->data.click.down) {
555          if(context->appdata->cur_cache) {
556            printf("ERROR: no current cache should be visible!\n");
557          } else {
558            gpx_t *is_in = NULL;
559    
560            if(!context->appdata->cur_gpx) {
561              printf("click while in \"all\" view\n");
562    
563              /* we first need to figure out which gpx file this cache */
564              /* is in so we can open it first */
565              gpx_t *gpx = context->appdata->gpx;
566              while(gpx && !is_in) {
567                cache_t *cur = gpx->cache;
568                while(cur && !is_in) {
569                  if(cur == cache)
570                    is_in = gpx;
571                  cur = cur->next;
572                }
573                gpx = gpx->next;
574              }
575    
576              if(is_in)
577                gpxlist_goto_cachelist(context->appdata, is_in);
578    
579            } else
580              /* the simple case: there already is an open gpx file and */
581              /* we just jump into the "cache" view */
582              is_in = context->appdata->cur_gpx;
583    
584            if(is_in) {
585              printf("selecting %s in %s\n",
586                     cache->id,
587                     context->appdata->cur_gpx->name);
588    
589              cachelist_goto_cache(context->appdata, cache);
590    
591              /* give focus to main screen (important for maemo) */
592              printf("raising main window\n");
593              gtk_window_present(GTK_WINDOW(context->appdata->window));
594            }
595          }
596        }
597      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
598        printf("removed\n");
599        context->balloon = NULL;
600      }
601    }
602    
603  static gboolean  static gboolean
604  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
605                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
606    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
607    
608    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
609      /* and the map is in navigation mode. the balloon is */
610      /* pretty useless there */
611      if(context->press_on && (context->state != MAP_CACHE)) {
612    
613        coord_t coo;
614        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
615    
616      pos_t pos =      pos_t pos =
617        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
618    
619      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
620      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
621        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
622        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
623          cache_popup(context, nearest);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
624          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
625    
626            context->balloon = nearest;
627            osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
628                                         balloon_cb, context);
629          }
630      }      }
631      context->press_on = NULL;      context->press_on = NULL;
632    } else {    } else {
# Line 637  on_map_button_release_event(GtkWidget *w Line 643  on_map_button_release_event(GtkWidget *w
643  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
644    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
645    
   printf("destroy map window\n");  
   
646    /* save map parameters */    /* save map parameters */
647    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
648    gint zoom;    gint zoom;
# Line 650  static void on_window_destroy(GtkWidget Line 654  static void on_window_destroy(GtkWidget
654    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
655    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
656    
657      gint source;
658      g_object_get(map, "map-source", &source, NULL);
659      context->appdata->map.source = source;
660    
661  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
662    /* restore cur_view */    /* restore cur_view */
663    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 661  static void on_window_destroy(GtkWidget Line 669  static void on_window_destroy(GtkWidget
669    appdata->map.context = NULL;    appdata->map.context = NULL;
670  }  }
671    
672    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
673    /* get access to zoom buttons */
674    static void
675    on_window_realize(GtkWidget *widget, gpointer data) {
676      if (widget->window) {
677        unsigned char value = 1;
678        Atom hildon_zoom_key_atom =
679          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
680          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
681        Display *dpy =
682          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
683        Window w = GDK_WINDOW_XID(widget->window);
684    
685        XChangeProperty(dpy, w, hildon_zoom_key_atom,
686                        integer_atom, 8, PropModeReplace, &value, 1);
687      }
688    }
689    #endif
690    
691    /* on maemo a window is either on top or completely invisible. this */
692    /* means that we only need to update the map window if its raised.  */
693    /* on ordinary desktops this is different and we always update */
694    
695    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
696                             gpointer data) {
697      printf("map got focus\n");
698      map_setup((map_context_t*)data);
699      return FALSE;
700    }
701    
702    void map_update(appdata_t *appdata) {
703      printf("map_update\n");
704    #ifndef USE_MAEMO
705      if(appdata->map.context)
706        map_setup(appdata->map.context);
707    #endif
708    }
709    
710  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
711    map_context_t *context = NULL;    map_context_t *context = NULL;
712    
713    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
714    if(appdata->map.context) {    if(appdata->map.context) {
715        printf("using existing map!\n");
716      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
717        map_setup(appdata->map.context);
718      return;      return;
719    }    }
720    
721    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
722    context->appdata = appdata;    context->appdata = appdata;
723      context->map_complete = FALSE;
724      context->state = MAP_NONE;
725    
726    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
727      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
728      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
729        printf("old file path %s exists\n", old_path);
730        rmdir_recursive(old_path);
731      }
732    
733      /* It is recommanded that all applications share these same */
734      /* map path, so data is only cached once. The path should be: */
735      /* ~/.osm-gps-map on standard PC     (users home) */
736      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
737      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
738    #if !defined(USE_MAEMO)
739      char *p = getenv("HOME");
740      if(!p) p = "/tmp";
741      char *path = g_strdup_printf("%s/.osm-gps-map", p);
742    #else
743    #if MAEMO_VERSION_MAJOR == 5
744      char *path = g_strdup("/home/user/.osm-gps-map");
745    #else
746      char *path = g_strdup("/media/mmc2/osm-gps-map");
747    #endif
748    #endif
749    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
750    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
751    
752      gint source = context->appdata->map.source;
753      if(!source) source = MAP_SOURCE;
754    
755    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
756                   "map-source",               MAP_SOURCE,                   "map-source",               source,
757                   "tile-cache",               path,                   "tile-cache",               path,
758                   "auto-center",              FALSE,                   "auto-center",              FALSE,
759                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 689  void map(appdata_t *appdata) { Line 763  void map(appdata_t *appdata) {
763    
764    g_free(path);    g_free(path);
765    
766    char *name = NULL;    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
 #ifdef USE_MAEMO  
   if(!appdata->cur_gpx) {  
 #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"));  
 #ifdef USE_MAEMO  
   } else {  
     map_draw_cachelist(context->widget, appdata->cur_gpx->cache);  
     name = g_strdup(appdata->cur_gpx->name);  
   }  
 #endif  
   
   char *title = g_strdup_printf(_("Map - %s"), name);  
   g_free(name);  
767    
768  #ifdef USE_MAEMO  #ifdef USE_MAEMO
769  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
770    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
771  #else    /* the user can e.g. still navigate the main menu */
772    context->window = hildon_window_new();    context->window = hildon_window_new();
773  #endif  
774    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
775      g_signal_connect(G_OBJECT(context->window), "realize",
776                       G_CALLBACK(on_window_realize), NULL);
777    #endif // MAEMO_VERSION
778  #else  #else
779    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
780  #endif  #endif
781    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
782  #ifndef USE_MAEMO  #ifndef USE_MAEMO
783    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
784  #endif  #endif
785    
786    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
787                       G_CALLBACK(on_focus_in), context);
788    
789    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
790                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 737  void map(appdata_t *appdata) { Line 795  void map(appdata_t *appdata) {
795    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
796                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
797    
   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);  
   
798    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
799    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    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);  
800    
801  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
802    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 771  void map(appdata_t *appdata) { Line 807  void map(appdata_t *appdata) {
807    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
808                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
809    
810    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
811    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
812  }  }
Legend:
Removed from v.56  
changed lines
  Added in v.144