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

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

revision 41 by harbaum, Mon Aug 3 14:21:57 2009 UTC revision 46 by harbaum, Wed Aug 5 14:11:00 2009 UTC
# Line 24  Line 24 
24  #include "osm-gps-map.h"  #include "osm-gps-map.h"
25  #endif  #endif
26    
27    /* equatorial radius in meters */
28    #define EQ_RADIUS     (6378137.0)
29    
30    #define RAD2DEG(a)  (((a)*180.0)/M_PI)
31    #define DEG2RAD(a)  (((a)*M_PI)/180.0)
32    
33  typedef struct {  typedef struct {
34    appdata_t *appdata;    appdata_t *appdata;
35    GtkWidget *widget;    GtkWidget *widget;
36    GtkWidget *zoomin, *zoomout, *gps;    GtkWidget *zoomin, *zoomout, *gps;
37    gint handler_id;    gint handler_id;
38      cache_t *press_on;
39  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
40    GtkWidget *old_view;    GtkWidget *old_view;
41  #endif  #endif
# Line 115  static GtkWidget Line 122  static GtkWidget
122                  char *tooltip) {                  char *tooltip) {
123    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
124    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
125                         gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU));                         gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON));
126    g_signal_connect(button, "clicked", cb, data);    g_signal_connect(button, "clicked", cb, data);
127  #ifndef USE_MAEMO  #ifndef USE_MAEMO
128    gtk_widget_set_tooltip_text(button, tooltip);    gtk_widget_set_tooltip_text(button, tooltip);
# Line 192  on_button_press_event(GtkWidget *widget, Line 199  on_button_press_event(GtkWidget *widget,
199                            GdkEventButton *event, popup_context_t *context) {                            GdkEventButton *event, popup_context_t *context) {
200    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);
201    
202    printf("overlay button press(in = %d)\n", in);    printf("overlay button press (in = %d)\n", in);
203    return !in;    return !in;
204  }  }
205    
# Line 201  on_button_release_event(GtkWidget *widge Line 208  on_button_release_event(GtkWidget *widge
208                            GdkEventButton *event, popup_context_t *context) {                            GdkEventButton *event, popup_context_t *context) {
209    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);
210    
211    printf("overlay button release(in = %d)\n", in);    printf("overlay button release (in = %d)\n", in);
212    
213    if(!in) {    if(!in) {
214      printf("destroying popup\n");      printf("destroying popup\n");
# Line 235  run_unmap_handler(GtkWindow *window, pop Line 242  run_unmap_handler(GtkWindow *window, pop
242    shutdown_loop(context);    shutdown_loop(context);
243  }  }
244    
245  void cache_popup(appdata_t *appdata, cache_t *cache) {  /* draw shape */
246    popup_context_t context;  #define ARROW_BORDER   20
247    context.appdata = appdata;  #define CORNER_RADIUS  10
248    
249    context.window = gtk_window_new(GTK_WINDOW_POPUP);  static void popup_window_shape(GtkWidget *window, int tip_x, int tip_y) {
250    gtk_widget_realize(context.window);    GdkBitmap *mask = gdk_pixmap_new(NULL, POPUP_WIDTH, POPUP_HEIGHT, 1);
251    gtk_window_set_default_size(GTK_WINDOW(context.window),  
252      GdkGC *gc = gdk_gc_new(mask);
253      GdkColormap *colormap;
254      GdkColor black;
255      GdkColor white;
256    
257      /* get black/white color values */
258      colormap = gdk_colormap_get_system();
259      gdk_color_black(colormap, &black);
260      gdk_color_white(colormap, &white);
261    
262      /* erase */
263      gdk_gc_set_foreground(gc, &black);
264      gdk_gc_set_background(gc, &white);
265    
266      /* erase background */
267      gdk_draw_rectangle(mask, gc, TRUE, 0, 0, POPUP_WIDTH, POPUP_HEIGHT);
268    
269      gdk_gc_set_foreground(gc, &white);
270      gdk_gc_set_background(gc, &black);
271    
272      gdk_draw_rectangle(mask, gc, TRUE,
273                         0, ARROW_BORDER + CORNER_RADIUS,
274                         POPUP_WIDTH,
275                         POPUP_HEIGHT - 2*CORNER_RADIUS - 2*ARROW_BORDER);
276    
277      gdk_draw_rectangle(mask, gc, TRUE,
278                         CORNER_RADIUS, ARROW_BORDER,
279                         POPUP_WIDTH  - 2*CORNER_RADIUS,
280                         POPUP_HEIGHT - 2*ARROW_BORDER);
281    
282      int off[][2] = {
283              { CORNER_RADIUS, ARROW_BORDER + CORNER_RADIUS },
284              { POPUP_WIDTH - CORNER_RADIUS,
285                ARROW_BORDER + CORNER_RADIUS },
286              { POPUP_WIDTH - CORNER_RADIUS,
287                POPUP_HEIGHT - CORNER_RADIUS - ARROW_BORDER },
288              { CORNER_RADIUS,
289                POPUP_HEIGHT - CORNER_RADIUS  - ARROW_BORDER}};
290    
291      int i;
292      for(i=0;i<4;i++) {
293        gdk_draw_arc(mask, gc, TRUE,
294                     off[i][0]-CORNER_RADIUS, off[i][1]-CORNER_RADIUS,
295                     2*CORNER_RADIUS,         2*CORNER_RADIUS,
296                     0, 360*64);
297      }
298    
299      GdkPoint points[3] = { {POPUP_WIDTH*1/3, POPUP_HEIGHT/2},
300                             {POPUP_WIDTH*2/3, POPUP_HEIGHT/2},
301                             {tip_x,tip_y} };
302      gdk_draw_polygon(mask, gc, TRUE, points, 3);
303    
304    
305      gdk_window_shape_combine_mask(window->window, mask, 0, 0);
306    }
307    
308    void cache_popup(map_context_t *mcontext, cache_t *cache) {
309      popup_context_t pcontext;
310      pcontext.appdata = mcontext->appdata;
311    
312      pcontext.window = gtk_window_new(GTK_WINDOW_POPUP);
313      gtk_widget_realize(pcontext.window);
314      gtk_window_set_default_size(GTK_WINDOW(pcontext.window),
315                                POPUP_WIDTH, POPUP_HEIGHT);                                POPUP_WIDTH, POPUP_HEIGHT);
316    gtk_window_resize(GTK_WINDOW(context.window),    gtk_window_resize(GTK_WINDOW(pcontext.window), POPUP_WIDTH, POPUP_HEIGHT);
317                      POPUP_WIDTH, POPUP_HEIGHT);    //  gtk_window_set_resizable(GTK_WINDOW(pcontext.window), FALSE);
318    //  gtk_window_set_resizable(GTK_WINDOW(context.window), FALSE);    gtk_window_set_transient_for(GTK_WINDOW(pcontext.window),
319    gtk_window_set_transient_for(GTK_WINDOW(context.window),                                 GTK_WINDOW(mcontext->appdata->window));
320                                 GTK_WINDOW(appdata->window));    gtk_window_set_keep_above(GTK_WINDOW(pcontext.window), TRUE);
321    gtk_window_set_keep_above(GTK_WINDOW(context.window), TRUE);    gtk_window_set_destroy_with_parent(GTK_WINDOW(pcontext.window), TRUE);
322    gtk_window_set_destroy_with_parent(GTK_WINDOW(context.window), TRUE);    gtk_window_set_gravity(GTK_WINDOW(pcontext.window), GDK_GRAVITY_STATIC);
323    gtk_window_set_gravity(GTK_WINDOW(context.window), GDK_GRAVITY_STATIC);    gtk_window_set_modal(GTK_WINDOW(pcontext.window), TRUE);
   gtk_window_set_modal(GTK_WINDOW(context.window), TRUE);  
324    
325    /* connect events */    /* connect events */
326    g_signal_connect(G_OBJECT(context.window), "button-press-event",    g_signal_connect(G_OBJECT(pcontext.window), "button-press-event",
327                     G_CALLBACK(on_button_press_event), &context);                     G_CALLBACK(on_button_press_event), &pcontext);
328    g_signal_connect(G_OBJECT(context.window), "button-release-event",    g_signal_connect(G_OBJECT(pcontext.window), "button-release-event",
329                     G_CALLBACK(on_button_release_event), &context);                     G_CALLBACK(on_button_release_event), &pcontext);
330    g_signal_connect(G_OBJECT(context.window), "delete-event",    g_signal_connect(G_OBJECT(pcontext.window), "delete-event",
331                     G_CALLBACK(run_delete_handler), &context);                     G_CALLBACK(run_delete_handler), &pcontext);
332    g_signal_connect(G_OBJECT(context.window), "destroy",    g_signal_connect(G_OBJECT(pcontext.window), "destroy",
333                     G_CALLBACK(run_destroy_handler), &context);                     G_CALLBACK(run_destroy_handler), &pcontext);
334    g_signal_connect(G_OBJECT(context.window), "unmap",    g_signal_connect(G_OBJECT(pcontext.window), "unmap",
335                     G_CALLBACK(run_unmap_handler), &context);                     G_CALLBACK(run_unmap_handler), &pcontext);
336    
337    gdk_pointer_grab(context.window->window, TRUE,    gdk_pointer_grab(pcontext.window->window, TRUE,
338       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,
339                     NULL, NULL, GDK_CURRENT_TIME);                     NULL, NULL, GDK_CURRENT_TIME);
340    gtk_grab_add(context.window);    gtk_grab_add(pcontext.window);
341    
342    //  gint x, y;    /* check whether cache is in upper or lower half of window */
343    //  gdk_window_get_origin(button->window, &x, &y);    gint x, y, sx, sy;
344      osm_gps_map_geographic_to_screen(OSM_GPS_MAP(mcontext->widget),
345    //  gtk_window_move(GTK_WINDOW(context.window),                                     cache->pos.lat, cache->pos.lon,
346    //              x + button->allocation.x,                                     &sx, &sy);
347    //              y + button->allocation.y - HEIGHT);  
348      printf("screen pos %d/%d\n", sx, sy);
349    
350      gdk_window_get_origin(mcontext->widget->window, &x, &y);
351      printf("window = %d/%d +%d+%d %d*%d\n", x, y,
352             mcontext->widget->allocation.x,
353             mcontext->widget->allocation.y,
354             mcontext->widget->allocation.width,
355             mcontext->widget->allocation.height
356             );
357    
358      gint ax = 0, ay = 0;
359      if(sx > mcontext->widget->allocation.width/2)
360        ax = POPUP_WIDTH;
361    
362      if(sy > mcontext->widget->allocation.height/2)
363        ay = POPUP_HEIGHT;
364    
365    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
366      GdkColor color;
367      gdk_color_parse("darkgray", &color);
368      gtk_widget_modify_bg(GTK_WIDGET(pcontext.window), GTK_STATE_NORMAL, &color);
369    #endif
370    
371      gtk_window_move(GTK_WINDOW(pcontext.window),
372                      x + mcontext->widget->allocation.x + sx - ax,
373                      y + mcontext->widget->allocation.y + sy - ay);
374    
   gtk_window_move(GTK_WINDOW(context.window),  
                   100,  
                   100);  
375    
   /* a frame with a vscale inside */  
376    GtkWidget *frame = gtk_frame_new(NULL);    GtkWidget *frame = gtk_frame_new(NULL);
377    gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);    gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE);
378      gtk_container_set_border_width(GTK_CONTAINER(frame),
379                                     ARROW_BORDER+CORNER_RADIUS);
380      gtk_container_add(GTK_CONTAINER(frame),
381                        gtk_button_new_with_label(cache->name));
382    
383    gtk_container_add(GTK_CONTAINER(frame), gtk_label_new(cache->name));    gtk_container_add(GTK_CONTAINER(pcontext.window), frame);
   gtk_container_add(GTK_CONTAINER(context.window), frame);  
384    
385    gtk_widget_show_all(context.window);    /* --------- give the window its shape ----------- */
386      popup_window_shape(pcontext.window, ax, ay);
387    
388      gtk_widget_show_all(pcontext.window);
389    
390    /* handle this popup until it's gone */    /* handle this popup until it's gone */
391    
392    context.loop = g_main_loop_new(NULL, FALSE);    pcontext.loop = g_main_loop_new(NULL, FALSE);
393    
394    GDK_THREADS_LEAVE();    GDK_THREADS_LEAVE();
395    g_main_loop_run(context.loop);    g_main_loop_run(pcontext.loop);
396    GDK_THREADS_ENTER();    GDK_THREADS_ENTER();
397    
398    g_main_loop_unref(context.loop);    g_main_loop_unref(pcontext.loop);
399    
400    printf("cache popup removed\n");    printf("cache popup removed\n");
401  }  }
402    
 #define RAD2DEG(a)  (((a)*180.0)/M_PI)  
   
403  static void  static void
404  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
405                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 354  pos_t coord2pos(coord_t coo) { Line 448  pos_t coord2pos(coord_t coo) {
448    return pos;    return pos;
449  }  }
450    
451    static int dist2pixel(map_context_t *context, float km, float lat) {
452      int zoom;
453      g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
454    
455      /* world at zoom 1 == 512 pixels */
456      float m_per_pix =
457        cos(DEG2RAD(lat))*2*M_PI*EQ_RADIUS/(1<<(8+zoom));
458    
459      return 1000.0*km/m_per_pix;
460    }
461    
462    #define CLICK_FUZZ (16)
463    
464  static gboolean  static gboolean
465  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
466                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
467    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
468    
469    pos_t pos =    /* got a press event without release event? eat it! */
470      coord2pos(osm_gps_map_get_co_ordinates(map, (int)event->x, (int)event->y));    if(context->press_on != NULL) {
471        printf("PRESS: already\n");
472        return TRUE;
473      }
474    
475    printf("clicked at %f/%f\n", pos.lat, pos.lon);    pos_t pos =
476        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
477    
478      cache_t *nearest = map_closest(context, &pos);
479      if(nearest) {
480        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
481        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
482          context->press_on = nearest;
483      }
484    
485    return FALSE;    return FALSE;
486  }  }
487    
488  static gboolean  static gboolean
489  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
490                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
491    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(context->press_on) {
492        OsmGpsMap *map = OSM_GPS_MAP(context->widget);
   pos_t pos =  
     coord2pos(osm_gps_map_get_co_ordinates(map, (int)event->x, (int)event->y));  
   
   printf("released at %f/%f\n", pos.lat, pos.lon);  
   
   /* return true if we clicked a cache */  
   /* ... */  
493    
494    cache_t *nearest = map_closest(context, &pos);      pos_t pos =
495          coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
   if(nearest) {  
     float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);  
496    
497      printf("nearest = %s, distance = %fkm\n", nearest->name, dist);      cache_t *nearest = map_closest(context, &pos);
498        if(nearest && nearest == context->press_on) {
499      cache_popup(context->appdata, nearest);        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
500          if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
501      return TRUE;          cache_popup(context, nearest);
502        }
503        context->press_on = NULL;
504    }    }
505    
506    return FALSE;    return FALSE;
507  }  }
508    
509    
510  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
511  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
512    printf("destroy map view\n");    printf("destroy map view\n");
# Line 438  void map(appdata_t *appdata) { Line 550  void map(appdata_t *appdata) {
550  #ifdef USE_MAEMO  #ifdef USE_MAEMO
551    } else {    } else {
552      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
553      name = g_strdup(_("appdata->cur_gpx->name"));      name = g_strdup(appdata->cur_gpx->name);
554    }    }
555  #endif  #endif
556    
# Line 456  void map(appdata_t *appdata) { Line 568  void map(appdata_t *appdata) {
568                            NULL);                            NULL);
569    
570  #ifndef USE_MAEMO  #ifndef USE_MAEMO
571    gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 350);    gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);
572  #else  #else
573    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);
574  #endif  #endif
Legend:
Removed from v.41  
changed lines
  Added in v.46