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

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

revision 61 by harbaum, Tue Aug 18 14:32:45 2009 UTC revision 218 by harbaum, Fri Nov 27 08:58:48 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    /*
26     * TODO:
27     * - make semi-transparent caches selectable
28     */
29    
30  #include "gpxview.h"  #include "gpxview.h"
31  #include "converter.h"  #include "converter.h"
32  #include <math.h>    // for isnan  #include <math.h>    // for isnan
33    
34  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
35  #include "osm-gps-map.h"  #include "osm-gps-map.h"
36    #include "osm-gps-map-osd-classic.h"
37  #endif  #endif
38    
39  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
40    #include <gdk/gdkx.h>
41    #include <X11/Xatom.h>
42    #endif
43    
44    /* default values */
45    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
46  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
47    
48  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 36  static const char *get_proxy_uri(appdata Line 53  static const char *get_proxy_uri(appdata
53    /* use environment settings if preset */    /* use environment settings if preset */
54    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
55    if(proxy) {    if(proxy) {
56      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
57      return proxy;      return proxy;
58    }    }
59    
# Line 57  static const char *get_proxy_uri(appdata Line 74  static const char *get_proxy_uri(appdata
74    
75        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
76                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
77          printf("map http proxy from gconf: %s\n ", proxy_buffer);
78    
79        g_free(host);        g_free(host);
80      }      }
# Line 66  static const char *get_proxy_uri(appdata Line 84  static const char *get_proxy_uri(appdata
84    return NULL;    return NULL;
85  }  }
86    
87  static void map_zoom(map_context_t *context, int step) {  static void
88    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));  
   
   /* 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;  
 }  
89    
90  static gboolean    if(but == OSD_GPS) {
91  cb_map_zoomout(GtkButton *button, map_context_t *context) {      pos_t *refpos = get_pos(context->appdata);
92    map_zoom(context, -1);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
93    return FALSE;        gint zoom;
94  }        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
95          if(zoom < 10)
96            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
97                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
98          else
99            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
100                                   refpos->lat, refpos->lon);
101    
102  static gboolean        /* re-enable centering */
103  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
104    pos_t *refpos = get_pos(context->appdata);      } else {
105    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
106      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
107                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
108    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
109    }    }
   
   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;  
110  }  }
111    
112  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 127  static int dist2pixel(map_context_t *con Line 115  static int dist2pixel(map_context_t *con
115    
116  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
117    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
118      static gboolean goto_is_enabled = FALSE;
119    
120    /* get reference position ... */    /* get reference position ... */
121    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
122    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
123    
124    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
125    gtk_widget_set_sensitive(context->gps, ok);    if(ok != goto_is_enabled) {
126        osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
127                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
128        goto_is_enabled = ok;
129      }
130    
131    if(ok) {    if(ok) {
132      float heading = NAN;      float heading = NAN;
# Line 148  static gboolean map_gps_update(gpointer Line 141  static gboolean map_gps_update(gpointer
141          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
142      }      }
143    
144        /* TODO: in order to save energy: only draw if state actually changed */
145    
146      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
147      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
148                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 157  static gboolean map_gps_update(gpointer Line 152  static gboolean map_gps_update(gpointer
152    return TRUE;    return TRUE;
153  }  }
154    
155  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
156                                   GdkEventConfigure *event,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
157                                   map_context_t *context) {  
158      GdkPixbuf *icon = icon_get(type, cache->type);
159      GdkPixbuf *over = NULL;
160    
161      if(cache->mine)                   over = icon_get(type, 14);
162      else if(cache->found)             over = icon_get(type, 12);
163      else if(cache->notes) {
164        if(cache->notes->found)         over = icon_get(type, 12);
165        else if(cache->notes->override) over = icon_get(type, 11);
166        else                            over = icon_get(type, 13);
167      }
168    
169      pos_t *pos = &cache->pos;
170      /* check if there's also an overwritten coordinate */
171      if(cache->notes && cache->notes->override)
172        pos = &cache->notes->pos;
173    
174      if(!isnan(pos->lat) && !isnan(pos->lon)) {
175        osm_gps_map_add_image(OSM_GPS_MAP(map),
176                              pos->lat, pos->lon, icon);
177        if(over)
178          osm_gps_map_add_image(OSM_GPS_MAP(map),
179                                pos->lat, pos->lon, over);
180      }
181    }
182    
183    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
184                             GtkWidget *map, gpx_t *gpx,
185                             cache_t *nav, gboolean semi) {
186      if(!gpx->notes_loaded) {
187        notes_load_all(appdata, gpx);
188        gpx->notes_loaded = TRUE;
189      }
190    
191      cache_t *cache = gpx->cache;
192      while(cache) {
193        /* search if we have that cache already in our list/displayed */
194        int i=0;
195        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
196          i++;
197    
198        if(!caches[i].id) {
199          /* if nav is given draw all other caches semitransparent. */
200          /* if nav is not given do what semi sais */
201          map_draw_cache(map, cache, nav?(cache != nav):semi);
202          caches[i].id = cache->id;
203        }
204    
205        cache = cache->next;
206      }
207    }
208    
209    /* draw geocaches and set window title */
210    static void map_setup(map_context_t *context) {
211      char *name = NULL;
212    
213      int cache_num = gpx_total_caches_global(context->appdata->gpx);
214    
215      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
216        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
217        //     cache_num, context->cache_list_len);
218        g_free(context->caches_displayed);
219        context->caches_displayed = NULL;
220        context->cache_list_len = 0;
221      }
222    
223      /* allocate buffer */
224      if(cache_num && !context->caches_displayed) {
225        context->cache_list_len = cache_num;
226        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
227        printf("allocated space to handle %d map icons\n", cache_num);
228      }
229    
230      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
231        if(context->state != MAP_ALL) {
232          printf("map_setup(ALL)\n");
233    
234          /* clear any pending balloon */
235          context->balloon = NULL;
236          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
237    
238    #ifdef OSD_NAV
239          /* no navigation in this mode */
240          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
241    #endif
242    
243          /* clear all existing cache images */
244          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
245          memset(context->caches_displayed, 0,
246                 (cache_num+1) * sizeof(cache_display_t));
247    
248          /* draw all geocaches and none is semi-transparent */
249          gpx_t *gpx = context->appdata->gpx;
250          while(gpx) {
251            map_draw_gpx(context->appdata, context->caches_displayed,
252                         context->widget, gpx, NULL, FALSE);
253            gpx = gpx->next;
254          }
255    
256          {
257            int i=0;
258            while(context->caches_displayed[i].id) i++;
259            printf("number of caches actually displayed: %d\n", i);
260          }
261    
262          name = g_strdup(_("all"));
263          context->state = MAP_ALL;
264        }
265      } else if(!context->appdata->cur_cache) {
266        if(context->state != MAP_GPX) {
267          printf("map_setup(GPX)\n");
268    
269          /* clear any pending balloon */
270          context->balloon = NULL;
271          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
272    
273    #ifdef OSD_NAV
274          /* no navigation in this mode */
275          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
276    #endif
277    
278          /* clear all existing cache images */
279          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
280          memset(context->caches_displayed, 0,
281                 (cache_num+1) * sizeof(cache_display_t));
282    
283          /* draw all geocaches and all other gpx files are semi-transparent */
284          map_draw_gpx(context->appdata, context->caches_displayed,
285                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
286    
287          gpx_t *gpx = context->appdata->gpx;
288          while(gpx) {
289            if(gpx != context->appdata->cur_gpx)
290              map_draw_gpx(context->appdata, context->caches_displayed,
291                           context->widget, gpx, NULL, TRUE);
292    
293            gpx = gpx->next;
294          }
295    
296    /* set default values if they are invalid */        name = g_strdup(context->appdata->cur_gpx->name);
297    if(!context->appdata->map.zoom ||        context->state = MAP_GPX;
298       isnan(context->appdata->map.pos.lat) ||      }
299       isnan(context->appdata->map.pos.lon)) {    } else {
300      printf("no valid map position found\n");      cache_t *cache = context->appdata->cur_cache;
301    
302      pos_t *refpos = get_pos(context->appdata);      printf("map_setup(CACHE)\n");
303      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
304        /* use gps position if present */      /* clear any pending balloon */
305        context->appdata->map.pos = *refpos;      context->balloon = NULL;
306        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
307      } else {  
308        /* use world map otherwise */      /* clear all existing ccahe images */
309        context->appdata->map.pos.lat = 0.0;      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
310        context->appdata->map.pos.lon = 0.0;      memset(context->caches_displayed, 0,
311        context->appdata->map.zoom = 1;             (cache_num+1) * sizeof(cache_display_t));
312    
313        /* draw all geocaches and all but selected one are semi-transparent */
314        gpx_t *gpx = context->appdata->gpx;
315        while(gpx) {
316          map_draw_gpx(context->appdata, context->caches_displayed,
317                       context->widget, gpx, cache, FALSE);
318          gpx = gpx->next;
319      }      }
320    
321        name = g_strdup(cache->name);
322        context->state = MAP_CACHE;
323    
324        /* navigation in this mode! */
325        pos_t cpos = gpx_cache_pos(cache);
326    
327    #ifdef OSD_NAV
328        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
329                                  context->appdata->imperial,
330                                  cpos.lat, cpos.lon, cache->name);
331    #else
332    #warning OSD_NAV not defined!
333    #endif
334    }    }
335    
336    /* jump to initial position */    if(name) {
337    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      char *title = g_strdup_printf(_("Map - %s"), name);
338                              context->appdata->map.pos.lat,      g_free(name);
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
   
   return FALSE;  
 }  
339    
340  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {      gtk_window_set_title(GTK_WINDOW(context->window), title);
   while(cache) {  
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
341    
342      osm_gps_map_add_image(OSM_GPS_MAP(map),      g_free(title);
343                            cache->pos.lat, cache->pos.lon, icon);    } else
344        printf("map_setup(keep)\n");
345    }
346    
347      cache = cache->next;  static gboolean on_map_configure(GtkWidget *widget,
348                                     GdkEventConfigure *event,
349                                     map_context_t *context) {
350    
351      /* for some reason there's a configure event with 1/1 */
352      /* on diablo. We just ignore this! */
353    
354      printf("on_map_configure %d %d\n",
355             widget->allocation.width,
356             widget->allocation.height);
357    
358      if(!context->map_complete &&
359         (widget->allocation.width > 100) &&
360         (widget->allocation.height > 100)) {
361    
362        /* setup cache state */
363        map_setup(context);
364    
365        /* set default values if they are invalid */
366        if(!context->appdata->map.zoom ||
367           isnan(context->appdata->map.pos.lat) ||
368           isnan(context->appdata->map.pos.lon)) {
369          printf("no valid map position found\n");
370    
371          pos_t *refpos = get_pos(context->appdata);
372          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
373            printf("use refpos\n");
374    
375            /* use gps position if present */
376            context->appdata->map.pos = *refpos;
377            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
378          } else {
379            printf("use zero pos\n");
380    
381            /* use world map otherwise */
382            context->appdata->map.pos.lat = 0.0;
383            context->appdata->map.pos.lon = 0.0;
384            context->appdata->map.zoom = 1;
385          }
386        }
387    
388        /* jump to initial position */
389        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
390               context->appdata->map.pos.lat,
391               context->appdata->map.pos.lon,
392               context->appdata->map.zoom);
393    
394        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
395                                  context->appdata->map.pos.lat,
396                                  context->appdata->map.pos.lon,
397                                  context->appdata->map.zoom);
398        context->map_complete = TRUE;
399    }    }
400    
401      return FALSE;
402  }  }
403    
404  static void  static void
405  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
406                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
407    
408    while(cache) {    while(cache) {
409        pos_t cpos = gpx_cache_pos(cache);
410    
411      float dist =      float dist =
412        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
413        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
414    
415      if(!(dist > *distance)) {      if(!(dist > *distance)) {
416        *result = cache;        *result = cache;
# Line 221  static cache_t *map_closest(map_context_ Line 425  static cache_t *map_closest(map_context_
425    cache_t *result = NULL;    cache_t *result = NULL;
426    float distance = NAN;    float distance = NAN;
427    
428  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
429      /* search all geocaches */      /* search all geocaches */
430      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
431      while(gpx) {      while(gpx) {
432        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
433        gpx = gpx->next;        gpx = gpx->next;
434      }      }
435  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
436      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
437                            pos, &result, &distance);                            pos, &result, &distance);
438    }    } else
439  #endif      result = context->appdata->cur_gpx->cache;
440    
441    return result;    return result;
442  }  }
# Line 253  pos_t coord2pos(coord_t coo) { Line 454  pos_t coord2pos(coord_t coo) {
454  static gboolean  static gboolean
455  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
456                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
457    
458    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
459    
460      /* check if we actually clicked parts of the OSD */
461      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
462        return FALSE;
463    
464    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
465    if(context->press_on != NULL) {    if(context->press_on != NULL) {
466      printf("PRESS: already\n");      printf("PRESS: already\n");
467      return TRUE;      return FALSE;
468    }    }
469    
470    pos_t pos =    pos_t pos =
# Line 266  on_map_button_press_event(GtkWidget *wid Line 472  on_map_button_press_event(GtkWidget *wid
472    
473    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
474    if(nearest) {    if(nearest) {
475      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
476      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
477        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
478        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
479        context->press_on = nearest;        context->press_on = nearest;
480    }    }
481    
# Line 285  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 493  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
493                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
494    
495    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
496      g_assert(image_surface);
497    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
498    
499    // Draw the image on the new Context    // Draw the image on the new Context
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 506  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
506    cairo_paint(cr);    cairo_paint(cr);
507  }  }
508    
509  #define LINE_SKIP  7  #ifndef BIG_BALLOONS
510    #define ICON_SIZE  ICON_CACHE_TYPE
511    #else
512    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
513    #endif
514    
515    #ifndef BIG_BALLOONS
516    #define FONT_SIZE 14.0
517    #else
518    #define FONT_SIZE 22.0
519    #endif
520    #define LINE_SKIP  (FONT_SIZE/4)
521    
522    
523  static void  static void
524  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
525    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
526    
527      map_context_t *context = (map_context_t*)data;
528      cache_t *cache = context->balloon;
529    
530    //  printf("draw cb for \"%s\"\n", cache->name);    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
531        printf("draw\n");
532    
533  #if 0  #if 0
534    /* draw pink background to check clipping */      /* draw pink background to check clipping */
535    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);      cairo_rectangle (event->data.draw.cr,
536    cairo_set_source_rgba (cr, 1, 0, 0, 0.3);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
537    cairo_fill_preserve (cr);                       event->data.draw.rect->w+40, event->data.draw.rect->h+40);
538    cairo_set_line_width (cr, 0);      cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
539    cairo_stroke (cr);      cairo_fill_preserve (event->data.draw.cr);
540  #endif      cairo_set_line_width (event->data.draw.cr, 0);
541        cairo_stroke (event->data.draw.cr);
542    /* leave a little border top and left */  #endif
543    gint x = rect->x, y = rect->y;  
544        /* leave a little border top and left */
545    /* draw the cache type icon ... */      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
546    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
547    cairo_draw_pixbuf(cr, icon, x, y);      /* draw the cache type icon ... */
548        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
549        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
550    
551        if(cache->notes && cache->notes->override) {
552          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
553          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
554        }
555    
556        /* ... and right of it the waypoint id */
557        cairo_text_extents_t extents;
558    
559        if(cache->id) {
560          cairo_select_font_face (event->data.draw.cr, "Sans",
561                                  CAIRO_FONT_SLANT_NORMAL,
562                                  CAIRO_FONT_WEIGHT_BOLD);
563    
564    #ifndef BIG_BALLOONS
565          cairo_set_font_size (event->data.draw.cr, 20.0);
566    #else
567          cairo_set_font_size (event->data.draw.cr, 36.0);
568    #endif
569    
570          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
571    
572          /* display id right of icon vertically centered */
573          x += gdk_pixbuf_get_width(icon) + 5;
574          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
575          cairo_move_to (event->data.draw.cr, x, y);
576          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
577          cairo_show_text (event->data.draw.cr, cache->id);
578          cairo_stroke (event->data.draw.cr);
579    
580          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
581        } else
582          y += gdk_pixbuf_get_height(icon);
583    
584        /* return to the left border and below icon/text */
585        x = event->data.draw.rect->x;
586    
587        /* everything from here uses the same font */
588        cairo_select_font_face (event->data.draw.cr, "Sans",
589                                CAIRO_FONT_SLANT_NORMAL,
590                                CAIRO_FONT_WEIGHT_NORMAL);
591    
592    /* ... and right of it the waypoint id */      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
593    cairo_text_extents_t extents;  
594        if(cache->name) {
595          /* draw cache name */
596          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
597          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
598          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
599          cairo_show_text (event->data.draw.cr, cache->name);
600          cairo_stroke (event->data.draw.cr);
601    
602          /* return to the left border and below text */
603          y += LINE_SKIP + FONT_SIZE;
604          x = event->data.draw.rect->x;
605        }
606    
607        if(cache->terrain) {
608          int text_y = 0, icon_y = 0;
609    
610    if(cache->id) {        /* draw cache rating */
611      cairo_select_font_face (cr, "Sans",        const char *terrain = "Terrain:";
612                              CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
613                              CAIRO_FONT_WEIGHT_BOLD);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
614    
615      cairo_set_font_size (cr, 20.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
616      cairo_text_extents (cr, cache->id, &extents);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
617          else
618            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
619    
620          /* draw "Terrain:" string */
621          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
622          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
623          cairo_show_text (event->data.draw.cr, _(terrain));
624          cairo_stroke (event->data.draw.cr);
625          x += extents.width + 2;
626    
627          /* draw terrain stars */
628          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
629    
630          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
631        }
632    
633        if(cache->difficulty) {
634          int text_y = 0, icon_y = 0;
635    
636      /* display id right of icon vertically centered */        const char *difficulty = "Difficulty:";
637      x += gdk_pixbuf_get_width(icon) + 5;        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
638      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
639      cairo_move_to (cr, x, y);  
640      cairo_set_source_rgba (cr, 0, 0, 0, 1);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
641      cairo_show_text (cr, cache->id);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
642      cairo_stroke (cr);        else
643            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
644    
645          /* draw "Difficulty:" string */
646          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
647          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
648          cairo_show_text (event->data.draw.cr, _(difficulty));
649          cairo_stroke (event->data.draw.cr);
650          x += extents.width + 2;
651    
652          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
653        }
654    
655      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;      /* draw container info */
656    } else      /* TODO ... */
     y += gdk_pixbuf_get_height(icon);  
657    
   /* return to the left border and below icon/text */  
   x = rect->x;  
658    
659    /* everything from here uses the same font */    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
660    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      printf("click %s event at %d %d\n",
661                            CAIRO_FONT_WEIGHT_NORMAL);             event->data.click.down?"down":"up",
662    cairo_set_font_size (cr, 14.0);             event->data.click.x, event->data.click.y);
663    
664    if(cache->name) {      /* make the main screen jump to that cache */
665      /* draw cache name */      if(!event->data.click.down) {
666      cairo_text_extents (cr, cache->name, &extents);        if(context->appdata->cur_cache) {
667      y += extents.height;          printf("ERROR: no current cache should be visible!\n");
668      cairo_move_to (cr, x, y);        } else {
669      cairo_set_source_rgba (cr, 0, 0, 0, 1);          gpx_t *is_in = NULL;
670      cairo_show_text (cr, cache->name);  
671      cairo_stroke (cr);          if(!context->appdata->cur_gpx) {
672              printf("click while in \"all\" view\n");
673      /* return to the left border and below text */  
674      y += LINE_SKIP;            /* we first need to figure out which gpx file this cache */
675      x = rect->x;            /* is in so we can open it first */
676    }            gpx_t *gpx = context->appdata->gpx;
677              while(gpx && !is_in) {
678    if(cache->terrain) {              cache_t *cur = gpx->cache;
679      /* draw cache rating */              while(cur && !is_in) {
680      const char *terrain = "Terrain:";                if(cur == cache)
681      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));                  is_in = gpx;
682      cairo_text_extents (cr, _(terrain), &extents);                cur = cur->next;
683      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;              }
684                gpx = gpx->next;
685      /* draw "Terrain:" string */            }
686      cairo_move_to (cr, x, y);  
687      cairo_set_source_rgba (cr, 0, 0, 0, 1);            if(is_in)
688      cairo_show_text (cr, _(terrain));              gpxlist_goto_cachelist(context->appdata, is_in);
689      cairo_stroke (cr);  
690      x += extents.width + 2;          } else
691              /* the simple case: there already is an open gpx file and */
692      /* draw terrain stars */            /* we just jump into the "cache" view */
693      cairo_draw_pixbuf(cr, icon, x, y -            is_in = context->appdata->cur_gpx;
694                        (gdk_pixbuf_get_height(icon) + extents.height)/2);  
695            if(is_in) {
696      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;            printf("selecting %s in %s\n",
697      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;                   cache->id,
698    }                   context->appdata->cur_gpx->name);
699    
700    if(cache->difficulty) {            cachelist_goto_cache(context->appdata, cache);
701      const char *difficulty = "Difficulty:";  
702      cairo_text_extents (cr, _(difficulty), &extents);            /* give focus to main screen (important for maemo) */
703      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;            printf("raising main window\n");
704              gtk_window_present(GTK_WINDOW(context->appdata->window));
705      /* draw "Difficulty:" string */          }
706      cairo_move_to (cr, x, y);        }
707      cairo_set_source_rgba (cr, 0, 0, 0, 1);      }
708      cairo_show_text (cr, _(difficulty));    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
709      cairo_stroke (cr);      printf("removed\n");
710      x += extents.width + 2;      context->balloon = NULL;
   
     icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));  
     cairo_draw_pixbuf(cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
711    }    }
712  }  }
713    
# Line 411  on_map_button_release_event(GtkWidget *w Line 716  on_map_button_release_event(GtkWidget *w
716                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
717    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
718    
719      /* in "MAP_CACHE" state only one cache is visible */
720      /* and the map is in navigation mode. the balloon is */
721      /* pretty useless there */
722    if(context->press_on) {    if(context->press_on) {
723    
724      coord_t coo;      coord_t coo;
725      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
726    
# Line 420  on_map_button_release_event(GtkWidget *w Line 729  on_map_button_release_event(GtkWidget *w
729    
730      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
731      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
732        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
733        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
734          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
735          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
736    
737          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
738                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
739                                         balloon_cb, context);
740        }        }
741      }      }
742      context->press_on = NULL;      context->press_on = NULL;
# Line 442  on_map_button_release_event(GtkWidget *w Line 754  on_map_button_release_event(GtkWidget *w
754  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
755    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
756    
   printf("destroy map window\n");  
   
757    /* save map parameters */    /* save map parameters */
758    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
759    gint zoom;    gint zoom;
# Line 455  static void on_window_destroy(GtkWidget Line 765  static void on_window_destroy(GtkWidget
765    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
766    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
767    
768      gint source;
769      g_object_get(map, "map-source", &source, NULL);
770      context->appdata->map.source = source;
771    
772  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
773    /* restore cur_view */    /* restore cur_view */
774    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
775  #endif  #endif
776    
777    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
778      gps_unregister_callback(appdata, context->cb_id);
779    
780      if(context->caches_displayed) {
781        g_free(context->caches_displayed);
782        context->caches_displayed = NULL;
783      }
784    
785    g_free(context);    g_free(context);
786    appdata->map.context = NULL;    appdata->map.context = NULL;
787  }  }
788    
789    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
790    /* get access to zoom buttons */
791    static void
792    on_window_realize(GtkWidget *widget, gpointer data) {
793      if (widget->window) {
794        unsigned char value = 1;
795        Atom hildon_zoom_key_atom =
796          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
797          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
798        Display *dpy =
799          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
800        Window w = GDK_WINDOW_XID(widget->window);
801    
802        XChangeProperty(dpy, w, hildon_zoom_key_atom,
803                        integer_atom, 8, PropModeReplace, &value, 1);
804      }
805    }
806    #endif
807    
808    /* on maemo a window is either on top or completely invisible. this */
809    /* means that we only need to update the map window if its raised.  */
810    /* on ordinary desktops this is different and we always update */
811    
812    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
813                             gpointer data) {
814      map_context_t *context = (map_context_t*)data;
815    
816      printf("map got focus\n");
817    
818    #ifdef USE_MAEMO
819      /* re-enable refresh of map */
820      if(!context->handler_id)
821        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
822    #endif
823    
824      map_setup(context);
825      return FALSE;
826    }
827    
828    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
829                             gpointer data) {
830      map_context_t *context = (map_context_t*)data;
831    
832      printf("map lost focus\n");
833    
834      /* save new map position */
835      gfloat lat, lon;
836      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
837    
838      context->appdata->map.pos.lat = lat;
839      context->appdata->map.pos.lon = lon;
840    
841    #ifdef USE_MAEMO
842      gtk_timeout_remove(context->handler_id);
843      context->handler_id = 0;
844    #endif
845    
846      return FALSE;
847    }
848    
849    void map_update(appdata_t *appdata) {
850      printf("map_update\n");
851    #ifndef USE_MAEMO
852      if(appdata->map.context)
853        map_setup(appdata->map.context);
854    #endif
855    }
856    
857    /* callback called by the gps layer whenever gps state changes */
858    static void
859    gps_callback(struct gps_state *state, gpointer data) {
860      printf("map: gps callback\n");
861    }
862    
863  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
864    map_context_t *context = NULL;    map_context_t *context = NULL;
865    
866    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
867    if(appdata->map.context) {    if(appdata->map.context) {
868        printf("using existing map!\n");
869      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
870        map_setup(appdata->map.context);
871      return;      return;
872    }    }
873    
874    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
875    context->appdata = appdata;    context->appdata = appdata;
876      context->map_complete = FALSE;
877      context->state = MAP_NONE;
878    
879    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
880      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
881      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
882        printf("old file path %s exists\n", old_path);
883        rmdir_recursive(old_path);
884      }
885    
886      /* It is recommanded that all applications share these same */
887      /* map path, so data is only cached once. The path should be: */
888      /* ~/.osm-gps-map on standard PC     (users home) */
889      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
890      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
891    #if !defined(USE_MAEMO)
892      char *p = getenv("HOME");
893      if(!p) p = "/tmp";
894      char *path = g_strdup_printf("%s/.osm-gps-map", p);
895    #else
896    #if MAEMO_VERSION_MAJOR == 5
897      char *path = g_strdup("/home/user/.osm-gps-map");
898    #else
899      char *path = g_strdup("/media/mmc2/osm-gps-map");
900    #endif
901    #endif
902    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
903    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
904    
905      gint source = context->appdata->map.source;
906      if(!source) source = MAP_SOURCE;
907    
908    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
909                   "map-source",               MAP_SOURCE,                   "map-source",               source,
910                   "tile-cache",               path,                   "tile-cache",               path,
911                   "auto-center",              FALSE,                   "auto-center",              FALSE,
912                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 494  void map(appdata_t *appdata) { Line 916  void map(appdata_t *appdata) {
916    
917    g_free(path);    g_free(path);
918    
919    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);  
920    
921  #ifdef USE_MAEMO  #ifdef USE_MAEMO
922  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
923    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
924  #else    /* the user can e.g. still navigate the main menu */
925    context->window = hildon_window_new();    context->window = hildon_window_new();
926  #endif  
927    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
928      g_signal_connect(G_OBJECT(context->window), "realize",
929                       G_CALLBACK(on_window_realize), NULL);
930    #endif // MAEMO_VERSION
931  #else  #else
932    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
933  #endif  #endif
934    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
935  #ifndef USE_MAEMO  #ifndef USE_MAEMO
936    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
937  #endif  #endif
938    
939    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
940                       G_CALLBACK(on_focus_in), context);
941    
942      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
943                       G_CALLBACK(on_focus_out), context);
944    
945    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
946                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 542  void map(appdata_t *appdata) { Line 951  void map(appdata_t *appdata) {
951    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
952                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
953    
   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);  
   
954    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
955    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
956    gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);    context->cb_id = gps_register_callback(appdata, gps_callback, context);
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
957    
958  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
959    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 964  void map(appdata_t *appdata) {
964    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
965                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
966    
967    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
968    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
969  }  }
Legend:
Removed from v.61  
changed lines
  Added in v.218