Diff of /trunk/src/osm-gps-map-osd-classic.c

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

revision 108 by harbaum, Fri Sep 11 19:20:55 2009 UTC revision 110 by harbaum, Sat Sep 12 20:56:35 2009 UTC
# Line 46  typedef struct { Line 46  typedef struct {
46      } controls;      } controls;
47    
48  #ifdef OSD_SCALE  #ifdef OSD_SCALE
49      cairo_surface_t *scale;      struct {
50      int scale_zoom;          cairo_surface_t *surface;
51            int zoom;
52        } scale;
53  #endif  #endif
54    
55  #ifdef OSD_CROSSHAIR  #ifdef OSD_CROSSHAIR
56      cairo_surface_t *crosshair;      struct {
57            cairo_surface_t *surface;
58            gboolean rendered;
59        } crosshair;
60  #endif  #endif
61    
62  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
63      cairo_surface_t *coordinates;      struct {
64      float coo_lat, coo_lon;          cairo_surface_t *surface;
65            float lat, lon;
66        } coordinates;
67  #endif  #endif
68    
69  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
70      /* values to handle the "source" menu */      struct {
71      cairo_surface_t *map_source;          /* values to handle the "source" menu */
72      gboolean expanded;          cairo_surface_t *surface;
73      gint shift, dir, count;          gboolean expanded;
74      gint handler_id;          gint shift, dir, count;
75      gint width, height;          gint handler_id;
76            gint width, height;
77        } source_sel;
78  #endif  #endif
79    
80  } osd_priv_t;  } osd_priv_t;
# Line 292  osd_check_zoom(gint x, gint y) { Line 301  osd_check_zoom(gint x, gint y) {
301  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)  #define OSD_S_H   (OSD_S_PH + OSD_SHADOW)
302    
303  /* size of usable area when expanded */  /* size of usable area when expanded */
304  #define OSD_S_AREA_W (priv->width)  #define OSD_S_AREA_W (priv->source_sel.width)
305  #define OSD_S_AREA_H (priv->height)  #define OSD_S_AREA_H (priv->source_sel.height)
306  #define OSD_S_EXP_W  (OSD_S_PW + OSD_S_AREA_W + OSD_SHADOW)  #define OSD_S_EXP_W  (OSD_S_PW + OSD_S_AREA_W + OSD_SHADOW)
307  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)  #define OSD_S_EXP_H  (OSD_S_AREA_H + OSD_SHADOW)
308    
# Line 309  osd_check_zoom(gint x, gint y) { Line 318  osd_check_zoom(gint x, gint y) {
318  /* or the entire menu incl. the puller (expanded) */  /* or the entire menu incl. the puller (expanded) */
319  static void  static void
320  osd_source_shape(osd_priv_t *priv, cairo_t *cr, gint x, gint y) {  osd_source_shape(osd_priv_t *priv, cairo_t *cr, gint x, gint y) {
321      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
322          /* just draw the puller */          /* just draw the puller */
323          cairo_move_to (cr, x + OSD_S_PW, y + OSD_S_PH);          cairo_move_to (cr, x + OSD_S_PW, y + OSD_S_PH);
324          cairo_arc (cr, x+OSD_S_RAD, y+OSD_S_RAD, OSD_S_RAD, M_PI/2, -M_PI/2);          cairo_arc (cr, x+OSD_S_RAD, y+OSD_S_RAD, OSD_S_RAD, M_PI/2, -M_PI/2);
# Line 337  osd_source_content(osm_gps_map_osd_t *os Line 346  osd_source_content(osm_gps_map_osd_t *os
346    
347      int py = offset + OSD_S_RAD - OSD_S_D0;      int py = offset + OSD_S_RAD - OSD_S_D0;
348    
349      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
350          /* draw the "puller" open (<) arrow */          /* draw the "puller" open (<) arrow */
351          cairo_move_to (cr, offset + OSD_S_RAD + OSD_S_D0/2, py);          cairo_move_to (cr, offset + OSD_S_RAD + OSD_S_D0/2, py);
352          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);          cairo_rel_line_to (cr, -OSD_S_D0, +OSD_S_D0);
# Line 362  osd_source_content(osm_gps_map_osd_t *os Line 371  osd_source_content(osm_gps_map_osd_t *os
371                                      CAIRO_FONT_WEIGHT_BOLD);                                      CAIRO_FONT_WEIGHT_BOLD);
372              cairo_set_font_size (cr, OSD_FONT_SIZE);              cairo_set_font_size (cr, OSD_FONT_SIZE);
373    
374              int i, step = (priv->height - 2*OSD_TEXT_BORDER) /              int i, step = (priv->source_sel.height - 2*OSD_TEXT_BORDER) /
375                  OSM_GPS_MAP_SOURCE_LAST;                  OSM_GPS_MAP_SOURCE_LAST;
376              for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {              for(i=OSM_GPS_MAP_SOURCE_NULL+1;i<=OSM_GPS_MAP_SOURCE_LAST;i++) {
377                  cairo_text_extents_t extents;                  cairo_text_extents_t extents;
# Line 376  osd_source_content(osm_gps_map_osd_t *os Line 385  osd_source_content(osm_gps_map_osd_t *os
385                  if(source == i) {                  if(source == i) {
386                      cairo_rectangle(cr, x - OSD_TEXT_BORDER/2,                      cairo_rectangle(cr, x - OSD_TEXT_BORDER/2,
387                                      y - OSD_TEXT_SKIP,                                      y - OSD_TEXT_SKIP,
388                                      priv->width - OSD_TEXT_BORDER,                                      priv->source_sel.width - OSD_TEXT_BORDER,
389                                      step + OSD_TEXT_SKIP);                                      step + OSD_TEXT_SKIP);
390                      cairo_fill(cr);                      cairo_fill(cr);
391    
# Line 417  osd_render_source_sel(osm_gps_map_osd_t Line 426  osd_render_source_sel(osm_gps_map_osd_t
426  #endif  #endif
427    
428      /* draw source selector */      /* draw source selector */
429      cairo_t *cr = cairo_create(priv->map_source);      cairo_t *cr = cairo_create(priv->source_sel.surface);
430      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
431      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
432      cairo_paint(cr);      cairo_paint(cr);
# Line 458  osd_source_reallocate(osm_gps_map_osd_t Line 467  osd_source_reallocate(osm_gps_map_osd_t
467      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
468    
469      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
470      g_assert (priv->map_source);      g_assert (priv->source_sel.surface);
471    
472      int w = OSD_S_W, h = OSD_S_H;      int w = OSD_S_W, h = OSD_S_H;
473      if(priv->expanded) {      if(priv->source_sel.expanded) {
474          cairo_text_extents_t extents;          cairo_text_extents_t extents;
475    
476          /* determine content size */          /* determine content size */
477          cairo_t *cr = cairo_create(priv->map_source);          cairo_t *cr = cairo_create(priv->source_sel.surface);
478          cairo_select_font_face (cr, "Sans",          cairo_select_font_face (cr, "Sans",
479                                  CAIRO_FONT_SLANT_NORMAL,                                  CAIRO_FONT_SLANT_NORMAL,
480                                  CAIRO_FONT_WEIGHT_BOLD);                                  CAIRO_FONT_WEIGHT_BOLD);
# Line 482  osd_source_reallocate(osm_gps_map_osd_t Line 491  osd_source_reallocate(osm_gps_map_osd_t
491          }          }
492          cairo_destroy(cr);          cairo_destroy(cr);
493    
494          priv->width  = max_w + 2*OSD_TEXT_BORDER;          priv->source_sel.width  = max_w + 2*OSD_TEXT_BORDER;
495          priv->height = OSM_GPS_MAP_SOURCE_LAST *          priv->source_sel.height = OSM_GPS_MAP_SOURCE_LAST *
496              (max_h + 2*OSD_TEXT_SKIP) + 2*OSD_TEXT_BORDER;              (max_h + 2*OSD_TEXT_SKIP) + 2*OSD_TEXT_BORDER;
497    
498          w = OSD_S_EXP_W;          w = OSD_S_EXP_W;
499          h = OSD_S_EXP_H;          h = OSD_S_EXP_H;
500      }      }
501    
502      cairo_surface_destroy(priv->map_source);      cairo_surface_destroy(priv->source_sel.surface);
503      priv->map_source =      priv->source_sel.surface =
504          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
505    
506      osd_render_source_sel(osd);      osd_render_source_sel(osd);
# Line 505  static gboolean osd_source_animate(gpoin Line 514  static gboolean osd_source_animate(gpoin
514      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
515      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;
516      gboolean done = FALSE;      gboolean done = FALSE;
517      priv->count += priv->dir;      priv->source_sel.count += priv->source_sel.dir;
518    
519      /* shifting in */      /* shifting in */
520      if(priv->dir < 0) {      if(priv->source_sel.dir < 0) {
521          if(priv->count <= 0) {          if(priv->source_sel.count <= 0) {
522              priv->count = 0;              priv->source_sel.count = 0;
523              done = TRUE;              done = TRUE;
524          }          }
525      } else {      } else {
526          if(priv->count >= 1000) {          if(priv->source_sel.count >= 1000) {
527              priv->expanded = FALSE;              priv->source_sel.expanded = FALSE;
528              osd_source_reallocate(osd);              osd_source_reallocate(osd);
529    
530              priv->count = 1000;              priv->source_sel.count = 1000;
531              done = TRUE;              done = TRUE;
532          }          }
533      }      }
# Line 527  static gboolean osd_source_animate(gpoin Line 536  static gboolean osd_source_animate(gpoin
536      /* count runs linearly from 0 to 1000, map this nicely onto a position */      /* count runs linearly from 0 to 1000, map this nicely onto a position */
537    
538      /* nicer sinoid mapping */      /* nicer sinoid mapping */
539      float m = 0.5-cos(priv->count * M_PI / 1000.0)/2;      float m = 0.5-cos(priv->source_sel.count * M_PI / 1000.0)/2;
540      priv->shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +      priv->source_sel.shift = (osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X) +
541          m * diff;          m * diff;
542    
543      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
544    
545      if(done)      if(done)
546          priv->handler_id = 0;          priv->source_sel.handler_id = 0;
547    
548      return !done;      return !done;
549  }  }
# Line 546  osd_source_toggle(osm_gps_map_osd_t *osd Line 555  osd_source_toggle(osm_gps_map_osd_t *osd
555      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
556    
557      /* ignore clicks while animation is running */      /* ignore clicks while animation is running */
558      if(priv->handler_id)      if(priv->source_sel.handler_id)
559          return;          return;
560    
561      /* expand immediately, collapse is handle at the end of the collapse animation */      /* expand immediately, collapse is handle at the end of the collapse animation */
562      if(!priv->expanded) {      if(!priv->source_sel.expanded) {
563          priv->expanded = TRUE;          priv->source_sel.expanded = TRUE;
564          osd_source_reallocate(osd);          osd_source_reallocate(osd);
565    
566          priv->count = 1000;          priv->source_sel.count = 1000;
567          priv->shift = osd->widget->allocation.width - OSD_S_W;          priv->source_sel.shift = osd->widget->allocation.width - OSD_S_W;
568          priv->dir = -1000/OSD_HZ;          priv->source_sel.dir = -1000/OSD_HZ;
569      } else {      } else {
570          priv->count =  0;          priv->source_sel.count =  0;
571          priv->shift = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;          priv->source_sel.shift = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;
572          priv->dir = +1000/OSD_HZ;          priv->source_sel.dir = +1000/OSD_HZ;
573      }      }
574    
575      priv->handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ, osd_source_animate, osd);      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ, osd_source_animate, osd);
576  }  }
577    
578  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
# Line 571  static osd_button_t Line 580  static osd_button_t
580  osd_source_check(osm_gps_map_osd_t *osd, gint x, gint y) {  osd_source_check(osm_gps_map_osd_t *osd, gint x, gint y) {
581      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
582    
583      if(!priv->expanded)      if(!priv->source_sel.expanded)
584          x -= osd->widget->allocation.width - OSD_S_W;          x -= osd->widget->allocation.width - OSD_S_W;
585      else      else
586          x -= osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;          x -= osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;
# Line 595  osd_source_check(osm_gps_map_osd_t *osd, Line 604  osd_source_check(osm_gps_map_osd_t *osd,
604      }      }
605    
606      /* check for clicks into data area */      /* check for clicks into data area */
607      if(priv->expanded && !priv->handler_id) {      if(priv->source_sel.expanded && !priv->source_sel.handler_id) {
608          /* re-adjust from puller top to content top */          /* re-adjust from puller top to content top */
609          if(OSD_S_Y < 0)          if(OSD_S_Y < 0)
610              y += OSD_S_EXP_H - OSD_S_PH;              y += OSD_S_EXP_H - OSD_S_PH;
# Line 605  osd_source_check(osm_gps_map_osd_t *osd, Line 614  osd_source_check(osm_gps_map_osd_t *osd,
614             y > 0 &&             y > 0 &&
615             y < OSD_S_EXP_H) {             y < OSD_S_EXP_H) {
616    
617              int step = (priv->height - 2*OSD_TEXT_BORDER)              int step = (priv->source_sel.height - 2*OSD_TEXT_BORDER)
618                  / OSM_GPS_MAP_SOURCE_LAST;                  / OSM_GPS_MAP_SOURCE_LAST;
619    
620              y -= OSD_TEXT_BORDER - OSD_TEXT_SKIP;              y -= OSD_TEXT_BORDER - OSD_TEXT_SKIP;
# Line 815  osd_render_coordinates(osm_gps_map_osd_t Line 824  osd_render_coordinates(osm_gps_map_osd_t
824      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
825    
826      /* check if position has changed enough to require redraw */      /* check if position has changed enough to require redraw */
827      if(!isnan(priv->coo_lat) && !isnan(priv->coo_lon))      if(!isnan(priv->coordinates.lat) && !isnan(priv->coordinates.lon))
828          if((fabsf(lat - priv->coo_lat) < 1/60000) &&     /* 1/60000 == 1/1000 minute */          /* 1/60000 == 1/1000 minute */
829             (fabsf(lon - priv->coo_lon) < 1/60000))          if((fabsf(lat - priv->coordinates.lat) < 1/60000) &&
830               (fabsf(lon - priv->coordinates.lon) < 1/60000))
831              return;              return;
832    
833      priv->coo_lat = lat;      priv->coordinates.lat = lat;
834      priv->coo_lon = lon;      priv->coordinates.lon = lon;
835    
836      /* first fill with light transparency */      /* first fill with light transparency */
837      cairo_t *cr = cairo_create(priv->coordinates);      cairo_t *cr = cairo_create(priv->coordinates.surface);
838      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
839      cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.5);      cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.5);
840      cairo_paint(cr);      cairo_paint(cr);
# Line 911  osd_render_crosshair(osm_gps_map_osd_t * Line 921  osd_render_crosshair(osm_gps_map_osd_t *
921  {  {
922      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
923    
924        if(priv->crosshair.rendered)
925            return;
926    
927        priv->crosshair.rendered = TRUE;
928    
929      /* first fill with transparency */      /* first fill with transparency */
930      cairo_t *cr = cairo_create(priv->crosshair);      cairo_t *cr = cairo_create(priv->crosshair.surface);
931      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
932      cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
     //    cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);  
933      cairo_paint(cr);      cairo_paint(cr);
934      cairo_set_operator(cr, CAIRO_OPERATOR_OVER);      cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
935    
# Line 956  osd_render_scale(osm_gps_map_osd_t *osd) Line 970  osd_render_scale(osm_gps_map_osd_t *osd)
970      /* this only needs to be rendered if the zoom has changed */      /* this only needs to be rendered if the zoom has changed */
971      gint zoom;      gint zoom;
972      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
973      if(zoom == priv->scale_zoom)      if(zoom == priv->scale.zoom)
974          return;          return;
975    
976      priv->scale_zoom = zoom;      priv->scale.zoom = zoom;
977    
978      float m_per_pix = osm_gps_map_get_scale(OSM_GPS_MAP(osd->widget));      float m_per_pix = osm_gps_map_get_scale(OSM_GPS_MAP(osd->widget));
979    
980      /* first fill with transparency */      /* first fill with transparency */
981      cairo_t *cr = cairo_create(priv->scale);      cairo_t *cr = cairo_create(priv->scale.surface);
982      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
983      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
984      // pink for testing:    cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);      // pink for testing:    cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);
# Line 1092  osd_render_controls(osm_gps_map_osd_t *o Line 1106  osd_render_controls(osm_gps_map_osd_t *o
1106  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
1107      priv->controls.gps_enabled = (osd->cb != NULL);      priv->controls.gps_enabled = (osd->cb != NULL);
1108  #endif  #endif
1109        priv->controls.rendered = TRUE;
1110    
1111  #ifndef OSD_COLOR  #ifndef OSD_COLOR
1112      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];      GdkColor bg = GTK_WIDGET(osd->widget)->style->bg[GTK_STATE_NORMAL];
# Line 1214  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1229  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1229    
1230  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1231          /* the initial OSD state is alway not-expanded */          /* the initial OSD state is alway not-expanded */
1232          priv->map_source =          priv->source_sel.surface =
1233              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1234                                             OSD_S_W+2, OSD_S_H+2);                                             OSD_S_W+2, OSD_S_H+2);
1235  #endif  #endif
1236    
1237  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1238          priv->scale =          priv->scale.surface =
1239              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1240                                         OSD_SCALE_W, OSD_SCALE_H);                                         OSD_SCALE_W, OSD_SCALE_H);
1241          priv->scale_zoom = -1;          priv->scale.zoom = -1;
1242  #endif  #endif
1243    
1244  #ifdef OSD_CROSSHAIR  #ifdef OSD_CROSSHAIR
1245          priv->crosshair =          priv->crosshair.surface =
1246              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1247                                         OSD_CROSSHAIR_W, OSD_CROSSHAIR_H);                                         OSD_CROSSHAIR_W, OSD_CROSSHAIR_H);
1248            priv->crosshair.rendered = FALSE;
1249  #endif  #endif
1250    
1251  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1252          priv->coordinates =          priv->coordinates.surface =
1253              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,              cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1254                                         OSD_COORDINATES_W, OSD_COORDINATES_H);                                         OSD_COORDINATES_W, OSD_COORDINATES_H);
1255    
1256          priv->coo_lat = priv->coo_lon = OSM_GPS_MAP_INVALID;          priv->coordinates.lat = priv->coordinates.lon = OSM_GPS_MAP_INVALID;
1257  #endif  #endif
1258    
1259          /* ... and render it */          /* ... and render it */
# Line 1255  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1271  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1271      if(x < 0) x += osd->widget->allocation.width - OSD_SCALE_W;      if(x < 0) x += osd->widget->allocation.width - OSD_SCALE_W;
1272      if(y < 0) y += osd->widget->allocation.height - OSD_SCALE_H;      if(y < 0) y += osd->widget->allocation.height - OSD_SCALE_H;
1273    
1274      cairo_set_source_surface(cr, priv->scale, x, y);      cairo_set_source_surface(cr, priv->scale.surface, x, y);
1275      cairo_paint(cr);      cairo_paint(cr);
1276  #endif  #endif
1277    
# Line 1263  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1279  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1279      x = (osd->widget->allocation.width - OSD_CROSSHAIR_W)/2;      x = (osd->widget->allocation.width - OSD_CROSSHAIR_W)/2;
1280      y = (osd->widget->allocation.height - OSD_CROSSHAIR_H)/2;      y = (osd->widget->allocation.height - OSD_CROSSHAIR_H)/2;
1281    
1282      cairo_set_source_surface(cr, priv->crosshair, x, y);      cairo_set_source_surface(cr, priv->crosshair.surface, x, y);
1283      cairo_paint(cr);      cairo_paint(cr);
1284  #endif  #endif
1285    
# Line 1273  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1289  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1289      if(x < 0) x += osd->widget->allocation.width - OSD_COORDINATES_W;      if(x < 0) x += osd->widget->allocation.width - OSD_COORDINATES_W;
1290      if(y < 0) y += osd->widget->allocation.height - OSD_COORDINATES_H;      if(y < 0) y += osd->widget->allocation.height - OSD_COORDINATES_H;
1291    
1292      cairo_set_source_surface(cr, priv->coordinates, x, y);      cairo_set_source_surface(cr, priv->coordinates.surface, x, y);
1293      cairo_paint(cr);      cairo_paint(cr);
1294  #endif  #endif
1295    
# Line 1289  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1305  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1305      cairo_paint(cr);      cairo_paint(cr);
1306    
1307  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1308      if(!priv->handler_id) {      if(!priv->source_sel.handler_id) {
1309          /* the OSD source selection is not being animated */          /* the OSD source selection is not being animated */
1310          if(!priv->expanded)          if(!priv->source_sel.expanded)
1311              x = osd->widget->allocation.width - OSD_S_W;              x = osd->widget->allocation.width - OSD_S_W;
1312          else          else
1313              x = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;              x = osd->widget->allocation.width - OSD_S_EXP_W + OSD_S_X;
1314      } else      } else
1315          x = priv->shift;          x = priv->source_sel.shift;
1316    
1317      y = OSD_S_Y;      y = OSD_S_Y;
1318      if(OSD_S_Y < 0) {      if(OSD_S_Y < 0) {
1319          if(!priv->expanded)          if(!priv->source_sel.expanded)
1320              y = osd->widget->allocation.height - OSD_S_H + OSD_S_Y;              y = osd->widget->allocation.height - OSD_S_H + OSD_S_Y;
1321          else          else
1322              y = osd->widget->allocation.height - OSD_S_EXP_H + OSD_S_Y;              y = osd->widget->allocation.height - OSD_S_EXP_H + OSD_S_Y;
1323      }      }
1324    
1325      cairo_set_source_surface(cr, priv->map_source, x, y);      cairo_set_source_surface(cr, priv->source_sel.surface, x, y);
1326      cairo_paint(cr);      cairo_paint(cr);
1327  #endif  #endif
1328    
# Line 1322  osd_free(osm_gps_map_osd_t *osd) Line 1338  osd_free(osm_gps_map_osd_t *osd)
1338           cairo_surface_destroy(priv->controls.surface);           cairo_surface_destroy(priv->controls.surface);
1339    
1340  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1341      if(priv->handler_id)      if(priv->source_sel.handler_id)
1342          gtk_timeout_remove(priv->handler_id);          gtk_timeout_remove(priv->source_sel.handler_id);
1343    
1344      if (priv->map_source)      if (priv->source_sel.surface)
1345           cairo_surface_destroy(priv->map_source);           cairo_surface_destroy(priv->source_sel.surface);
1346  #endif  #endif
1347    
1348  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1349      if (priv->scale)      if (priv->scale.surface)
1350           cairo_surface_destroy(priv->scale);           cairo_surface_destroy(priv->scale.surface);
1351  #endif  #endif
1352    
1353  #ifdef OSD_CROSSHAIR  #ifdef OSD_CROSSHAIR
1354      if (priv->crosshair)      if (priv->crosshair.surface)
1355           cairo_surface_destroy(priv->crosshair);           cairo_surface_destroy(priv->crosshair.surface);
1356  #endif  #endif
1357    
1358  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1359      if (priv->coordinates)      if (priv->coordinates.surface)
1360           cairo_surface_destroy(priv->coordinates);           cairo_surface_destroy(priv->coordinates.surface);
1361  #endif  #endif
1362    
1363      g_free(priv);      g_free(priv);
# Line 1352  osd_busy(osm_gps_map_osd_t *osd) Line 1368  osd_busy(osm_gps_map_osd_t *osd)
1368  {  {
1369  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
1370      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1371      return (priv->handler_id != 0);      return (priv->source_sel.handler_id != 0);
1372  #else  #else
1373      return FALSE;      return FALSE;
1374  #endif  #endif
Legend:
Removed from v.108  
changed lines
  Added in v.110