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

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

revision 220 by harbaum, Sat Nov 28 14:20:28 2009 UTC revision 238 by harbaum, Sat Dec 12 12:54:37 2009 UTC
# Line 88  static void Line 88  static void
88  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
89    
90    if(but == OSD_GPS) {    if(but == OSD_GPS) {
91        printf("clicked OSD_GPS %p\n", context);
92        printf("clicked OSD_GPS a %p\n", context->appdata);
93    
94      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
95      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96        gint zoom;        gint zoom;
# Line 115  static int dist2pixel(map_context_t *con Line 118  static int dist2pixel(map_context_t *con
118    
119  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
120    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
121    static gboolean goto_is_enabled = FALSE;  
122    #ifdef USE_MAEMO
123      if(context->appdata->goto_disable_screensaver)
124        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
125          fprintf(stderr, "error with display blank\n");
126    #endif
127    
128    /* get reference position ... */    /* get reference position ... */
129    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
130    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
131    
132    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
133    if(ok != goto_is_enabled) {    if(ok != context->goto_is_enabled) {
134      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
135                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
136      goto_is_enabled = ok;      context->goto_is_enabled = ok;
137    }    }
138    
139    if(ok) {    if(ok) {
# Line 360  static void map_setup(map_context_t *con Line 368  static void map_setup(map_context_t *con
368    
369    /* remove all existing appearances of this icon first */    /* remove all existing appearances of this icon first */
370    osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),    osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
371                             icon_get(ICON_MISC, 6));                             icon_get(ICON_MISC, 4));
372    
373    if(!isnan(context->appdata->geomath.lat) &&    if(!isnan(context->appdata->geomath.lat) &&
374       !isnan(context->appdata->geomath.lon))  {       !isnan(context->appdata->geomath.lon))  {
# Line 368  static void map_setup(map_context_t *con Line 376  static void map_setup(map_context_t *con
376      osm_gps_map_add_image(OSM_GPS_MAP(context->widget),      osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
377                            context->appdata->geomath.lat,                            context->appdata->geomath.lat,
378                            context->appdata->geomath.lon,                            context->appdata->geomath.lon,
379                            icon_get(ICON_MISC, 6));                            icon_get(ICON_MISC, 4));
380    }    }
381    
382    if(name) {    if(name) {
# Line 382  static void map_setup(map_context_t *con Line 390  static void map_setup(map_context_t *con
390      printf("map_setup(keep)\n");      printf("map_setup(keep)\n");
391  }  }
392    
 static gboolean on_map_configure(GtkWidget *widget,  
                                  GdkEventConfigure *event,  
                                  map_context_t *context) {  
   
   /* for some reason there's a configure event with 1/1 */  
   /* on diablo. We just ignore this! */  
   
   printf("on_map_configure %d %d\n",  
          widget->allocation.width,  
          widget->allocation.height);  
   
   if(!context->map_complete &&  
      (widget->allocation.width > 100) &&  
      (widget->allocation.height > 100)) {  
   
     /* setup cache state */  
     map_setup(context);  
   
     /* set default values if they are invalid */  
     if(!context->appdata->map.zoom ||  
        isnan(context->appdata->map.pos.lat) ||  
        isnan(context->appdata->map.pos.lon)) {  
       printf("no valid map position found\n");  
   
       pos_t *refpos = get_pos(context->appdata);  
       if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
         printf("use refpos\n");  
   
         /* use gps position if present */  
         context->appdata->map.pos = *refpos;  
         context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
       } else {  
         printf("use zero pos\n");  
   
         /* use world map otherwise */  
         context->appdata->map.pos.lat = 0.0;  
         context->appdata->map.pos.lon = 0.0;  
         context->appdata->map.zoom = 1;  
       }  
     }  
   
     /* jump to initial position */  
     printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",  
            context->appdata->map.pos.lat,  
            context->appdata->map.pos.lon,  
            context->appdata->map.zoom);  
   
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               context->appdata->map.pos.lat,  
                               context->appdata->map.pos.lon,  
                               context->appdata->map.zoom);  
     context->map_complete = TRUE;  
   }  
   
   return FALSE;  
 }  
   
393  static void  static void
394  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
395                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 820  static void on_window_destroy(GtkWidget Line 771  static void on_window_destroy(GtkWidget
771      context->caches_displayed = NULL;      context->caches_displayed = NULL;
772    }    }
773    
774      printf("destroy map context\n");
775    g_free(context);    g_free(context);
776    appdata->map.context = NULL;    appdata->map.context = NULL;
777  }  }
# Line 910  void map(appdata_t *appdata) { Line 862  void map(appdata_t *appdata) {
862    }    }
863    
864    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
865      printf("allocated new context at %p\n", context);
866    
867    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
868    context->state = MAP_NONE;    context->state = MAP_NONE;
869    
870    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 956  void map(appdata_t *appdata) { Line 909  void map(appdata_t *appdata) {
909    
910    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
911    
912      /* set default values if they are invalid */
913      if(!context->appdata->map.zoom ||
914         isnan(context->appdata->map.pos.lat) ||
915         isnan(context->appdata->map.pos.lon)) {
916        printf("no valid map position found\n");
917    
918        pos_t *refpos = get_pos(context->appdata);
919        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
920          printf("use refpos\n");
921    
922            /* use gps position if present */
923          context->appdata->map.pos = *refpos;
924          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
925        } else {
926          printf("use zero pos\n");
927    
928          /* use world map otherwise */
929          context->appdata->map.pos.lat = 0.0;
930          context->appdata->map.pos.lon = 0.0;
931          context->appdata->map.zoom = 1;
932        }
933      }
934    
935      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
936                                context->appdata->map.pos.lat,
937                                context->appdata->map.pos.lon,
938                                context->appdata->map.zoom);
939    
940  #ifdef USE_MAEMO  #ifdef USE_MAEMO
941    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
942    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 980  void map(appdata_t *appdata) { Line 961  void map(appdata_t *appdata) {
961    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
962                     G_CALLBACK(on_focus_out), context);                     G_CALLBACK(on_focus_out), context);
963    
   g_signal_connect(G_OBJECT(context->widget), "configure-event",  
                    G_CALLBACK(on_map_configure), context);  
   
964    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
965                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
966    
# Line 1004  void map(appdata_t *appdata) { Line 982  void map(appdata_t *appdata) {
982    
983    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
984    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
985    
986      /* setup cache state */
987      map_setup(context);
988  }  }
Legend:
Removed from v.220  
changed lines
  Added in v.238