--- trunk/src/osm-gps-map.c 2009/08/18 20:33:08 62 +++ trunk/src/osm-gps-map.c 2009/08/19 12:35:25 63 @@ -1409,15 +1409,242 @@ #ifdef ENABLE_OSD /* position and extent of bounding box */ -#define OSD_X (10) -#define OSD_Y (10) -#define OSD_W (80+5) -#define OSD_H (120+5) +#define OSD_X (10) +#define OSD_Y (10) + +#define OSD_COLOR 0.5, 0.5, 1 + +/* parameters of the direction shape */ +#define D_RAD (20) // diameter of dpad +#define D_TIP (4*D_RAD/5) // distance of arrow tip from dpad center +#define D_LEN (D_RAD/4) // length of arrow +#define D_WID (D_LEN) // width of arrow + +/* parameters of the "zoom" pad */ +#define Z_STEP (-D_RAD/8) // distance between dpad and zoom +#define Z_RAD (D_RAD/2) // radius of "caps" of zoom bar + +/* shadow also depends on control size */ +#define OSD_SHADOW (D_RAD/8) + +/* total width and height of controls incl. shadow */ +#define OSD_W (2*D_RAD + OSD_SHADOW) +#define OSD_H (2*D_RAD + Z_STEP + 2*Z_RAD + OSD_SHADOW) + +#define OSD_LBL_SHADOW (OSD_SHADOW/2) + +#define Z_TOP (2 * D_RAD + Z_STEP) +#define Z_MID (Z_TOP + Z_RAD) +#define Z_BOT (Z_MID + Z_RAD) +#define Z_LEFT (Z_RAD) +#define Z_RIGHT (2 * D_RAD - Z_RAD) + +/* create the cairo shape used for the zoom buttons */ +static void +osm_gps_map_osd_zoom_shape(cairo_t *cr, gint x, gint y) { + cairo_move_to (cr, x+Z_LEFT, y+Z_TOP); + cairo_line_to (cr, x+Z_RIGHT, y+Z_TOP); + cairo_arc (cr, x+Z_RIGHT, y+Z_MID, Z_RAD, -M_PI/2, M_PI/2); + cairo_line_to (cr, x+Z_LEFT, y+Z_BOT); + cairo_arc (cr, x+Z_LEFT, y+Z_MID, Z_RAD, M_PI/2, -M_PI/2); +} + +/* create the cairo shape used for the dpad */ +static void +osm_gps_map_osd_dpad_shape(cairo_t *cr, gint x, gint y) { + cairo_arc (cr, x+D_RAD, y+D_RAD, D_RAD, 0, 2 * M_PI); +} + +typedef enum { + OSD_NONE = 0, + OSD_BG, + OSD_UP, + OSD_DOWN, + OSD_LEFT, + OSD_RIGHT, + OSD_IN, + OSD_OUT, + OSD_GPS +} osd_button_t; + +static gboolean +osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad) +{ + return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad); +} + +/* check whether x/y is within the dpad */ +static osd_button_t +osm_gps_map_osd_check_dpad(gint x, gint y) +{ + /* within entire dpad circle */ + if( osm_gps_map_in_circle(x, y, OSD_X + D_RAD, OSD_Y + D_RAD, D_RAD)) + { + /* convert into position relative to dpads centre */ + x -= (OSD_X + D_RAD); + y -= (OSD_Y + D_RAD); + + /* check for dpad center goes here! */ + if( osm_gps_map_in_circle(x, y, OSD_X + D_RAD, OSD_Y + D_RAD, D_RAD/3)) + return OSD_GPS; + + if( y < 0 && abs(x) < abs(y)) + return OSD_UP; + + if( y > 0 && abs(x) < abs(y)) + return OSD_DOWN; + + if( x < 0 && abs(y) < abs(x)) + return OSD_LEFT; + + if( x > 0 && abs(y) < abs(x)) + return OSD_RIGHT; + + return OSD_BG; + } + return OSD_NONE; +} + +/* check whether x/y is within the zoom pads */ +static osd_button_t +osm_gps_map_osd_check_zoom(gint x, gint y) { + if( x > OSD_X && x < (OSD_X + OSD_W) && y > Z_TOP && y < Z_BOT) { + + /* within circle around (-) label */ + if( osm_gps_map_in_circle(x, y, OSD_X + Z_LEFT, OSD_Y + Z_MID, Z_RAD)) + return OSD_OUT; + + /* between center of (-) button and center of entire zoom control area */ + if(x > OSD_LEFT && x < OSD_X + D_RAD) + return OSD_OUT; + + /* within circle around (+) label */ + if( osm_gps_map_in_circle(x, y, OSD_X + Z_RIGHT, OSD_Y + Z_MID, Z_RAD)) + return OSD_IN; + + /* between center of (+) button and center of entire zoom control area */ + if(x < OSD_RIGHT && x > OSD_X + D_RAD) + return OSD_IN; + } + + return OSD_NONE; +} + +static osd_button_t +osm_gps_map_osd_check(gint x, gint y) { + osd_button_t but = OSD_NONE; + + /* first do a rough test for the OSD area. */ + /* this is just to avoid an unnecessary detailed test */ + if(x > OSD_X && x < OSD_X + OSD_W && + y > OSD_Y && y < OSD_Y + OSD_H) { + + but = osm_gps_map_osd_check_dpad(x, y); + + if(but == OSD_NONE) + but = osm_gps_map_osd_check_zoom(x, y); + } + + return but; +} + +static void +osm_gps_map_osd_shape_shadow(cairo_t *cr) { + cairo_set_source_rgba (cr, 0, 0, 0, 0.2); + cairo_fill (cr); + cairo_stroke (cr); +} + +static void +osm_gps_map_osd_shape(cairo_t *cr) { + cairo_set_source_rgb (cr, 1, 1, 1); + cairo_fill_preserve (cr); + cairo_set_source_rgb (cr, OSD_COLOR); + cairo_set_line_width (cr, 1); + cairo_stroke (cr); +} static void -osm_gps_map_draw_osd_controls (OsmGpsMap *map, gint xoffset, gint yoffset) +osm_gps_map_osd_dpad_labels(cairo_t *cr, gint x, gint y) { + /* move reference to dpad center */ + x += D_RAD; + y += D_RAD; + + const static gint offset[][3][2] = { + /* left arrow/triangle */ + { { -D_TIP+D_LEN, -D_WID }, { -D_LEN, D_WID }, { +D_LEN, D_WID } }, + /* right arrow/triangle */ + { { +D_TIP-D_LEN, -D_WID }, { +D_LEN, D_WID }, { -D_LEN, D_WID } }, + /* top arrow/triangle */ + { { -D_WID, -D_TIP+D_LEN }, { D_WID, -D_LEN }, { D_WID, +D_LEN } }, + /* bottom arrow/triangle */ + { { -D_WID, +D_TIP-D_LEN }, { D_WID, +D_LEN }, { D_WID, -D_LEN } } + }; + + int i; + for(i=0;i<4;i++) { + cairo_move_to (cr, x + offset[i][0][0], y + offset[i][0][1]); + cairo_rel_line_to (cr, offset[i][1][0], offset[i][1][1]); + cairo_rel_line_to (cr, offset[i][2][0], offset[i][2][1]); + } +} + +/* draw the sattelite dish icon in the center of the dpad */ +#define GPS_V0 (D_RAD/8) +#define GPS_V1 (D_RAD/10) +#define GPS_V2 (D_RAD/5) + +/* draw a satellite receiver dish */ +static void +osm_gps_map_osd_dpad_gps(cairo_t *cr, gint x, gint y) { + /* move reference to dpad center */ + x += D_RAD; + y += D_RAD + GPS_V0; + + cairo_move_to (cr, x-GPS_V0, y+GPS_V0); + cairo_rel_line_to (cr, +GPS_V0, -GPS_V0); + cairo_rel_line_to (cr, +GPS_V0, +GPS_V0); + cairo_close_path (cr); + + cairo_move_to (cr, x+GPS_V1-GPS_V2, y-2*GPS_V2); + cairo_curve_to (cr, x-GPS_V2, y, x+GPS_V1, y+GPS_V1, x+GPS_V1+GPS_V2, y); + cairo_close_path (cr); + + x += GPS_V1; + cairo_move_to (cr, x, y-GPS_V2); + cairo_rel_line_to (cr, +GPS_V1, -GPS_V1); +} + +#define Z_LEN (2*Z_RAD/3) + +static void +osm_gps_map_osd_zoom_labels(cairo_t *cr, gint x, gint y) { + cairo_move_to (cr, x + Z_LEFT - Z_LEN, y + Z_MID); + cairo_line_to (cr, x + Z_LEFT + Z_LEN, y + Z_MID); + + cairo_move_to (cr, x + Z_RIGHT, y + Z_MID - Z_LEN); + cairo_line_to (cr, x + Z_RIGHT, y + Z_MID + Z_LEN); + cairo_move_to (cr, x + Z_RIGHT - Z_LEN, y + Z_MID); + cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID); +} + +static void +osm_gps_map_osd_labels(cairo_t *cr, gint width) { + cairo_set_source_rgb (cr, OSD_COLOR); + cairo_set_line_width (cr, width); + cairo_stroke (cr); +} + +static void +osm_gps_map_osd_labels_shadow(cairo_t *cr, gint width) { + cairo_set_source_rgba (cr, 0, 0, 0, 0.2); + cairo_set_line_width (cr, width); + cairo_stroke (cr); +} + +static void +osm_gps_map_osd_draw_controls (OsmGpsMap *map, gint xoffset, gint yoffset) { - /* xyz */ OsmGpsMapPrivate *priv = map->priv; /* backup previous contents */ @@ -1457,100 +1684,33 @@ // cairo_t *cr = cairo_create(surface); cairo_t *cr = gdk_cairo_create(priv->pixmap); -#define RAD 40 -#define TIP 35 -#define LEN 15 -#define WID 15 - -#define Z_STEP -5 -#define Z_RAD 15 -#define Z_TOP 2*RAD+Z_STEP -#define Z_MID Z_TOP+Z_RAD -#define Z_BOT Z_MID+Z_RAD -#define Z_LEFT Z_RAD -#define Z_RIGHT 2*RAD-Z_RAD - - /* --------- the direction "pad" shape and shadow ----------- */ - - cairo_move_to (cr, x+Z_LEFT+5, y+Z_TOP+5); - cairo_line_to (cr, x+Z_RIGHT+5, y+Z_TOP+5); - cairo_arc (cr, x+Z_RIGHT+5, y+Z_MID+5, Z_RAD, -M_PI/2, M_PI/2); - cairo_line_to (cr, x+Z_LEFT+5, y+Z_BOT+5); - cairo_arc (cr, x+Z_LEFT+5, y+Z_MID+5, Z_RAD, M_PI/2, -M_PI/2); - cairo_close_path (cr); - - cairo_set_source_rgba (cr, 0, 0, 0, 0.2); - cairo_fill (cr); - cairo_stroke (cr); - - cairo_arc (cr, x+RAD+5, y+RAD+5, RAD, 0, 2 * M_PI); - cairo_close_path (cr); - - cairo_set_source_rgba (cr, 0, 0, 0, 0.2); - cairo_fill (cr); - cairo_stroke (cr); - - - cairo_move_to (cr, x+Z_LEFT, y+Z_TOP); - cairo_line_to (cr, x+Z_RIGHT, y+Z_TOP); - cairo_arc (cr, x+Z_RIGHT, y+Z_MID, Z_RAD, -M_PI/2, M_PI/2); - cairo_line_to (cr, x+Z_LEFT, y+Z_BOT); - cairo_arc (cr, x+Z_LEFT, y+Z_MID, Z_RAD, M_PI/2, -M_PI/2); - cairo_close_path (cr); - - cairo_set_source_rgb (cr, 1, 1, 1); - cairo_fill_preserve (cr); - cairo_set_source_rgb (cr, 0.6, 0.6, 1); - cairo_set_line_width (cr, 1); - cairo_stroke (cr); - - cairo_arc (cr, x+RAD, y+RAD, RAD, 0, 2 * M_PI); - cairo_close_path (cr); - - cairo_set_source_rgb (cr, 1, 1, 1); - cairo_fill_preserve (cr); - cairo_set_source_rgb (cr, 0.6, 0.6, 1); - cairo_set_line_width (cr, 1); - cairo_stroke (cr); - - /* ---------- the zoom pad shape and shadow -------------- */ - - - - /* left arrow/triangle */ - cairo_move_to (cr, x+RAD-TIP, y+RAD); - cairo_rel_line_to (cr, +LEN, -WID/2); - cairo_rel_line_to (cr, 0, +WID); - cairo_rel_line_to (cr, -LEN, -WID/2); - cairo_close_path (cr); - - /* right arrow/triangle */ - cairo_move_to (cr, x+RAD+TIP, y+RAD); - cairo_rel_line_to (cr, -LEN, -WID/2); - cairo_rel_line_to (cr, 0, +WID); - cairo_rel_line_to (cr, +LEN, -WID/2); - cairo_close_path (cr); - - /* top arrow/triangle */ - cairo_move_to (cr, x+RAD, y+RAD-TIP); - cairo_rel_line_to (cr, -WID/2, +LEN); - cairo_rel_line_to (cr, +WID, 0); - cairo_rel_line_to (cr, -WID/2, -LEN); - cairo_close_path (cr); - - /* bottom arrow/triangle */ - cairo_move_to (cr, x+RAD, y+RAD+TIP); - cairo_rel_line_to (cr, -WID/2, -LEN); - cairo_rel_line_to (cr, +WID, 0); - cairo_rel_line_to (cr, -WID/2, +LEN); - cairo_close_path (cr); - - cairo_set_source_rgb (cr, 0.6, 0.6, 1); - cairo_fill_preserve (cr); - cairo_set_line_width (cr, 0); - cairo_set_source_rgba (cr, 0, 0, 0, 1); - cairo_stroke (cr); + /* --------- draw zoom and dpad shape shadow ----------- */ + osm_gps_map_osd_zoom_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW); + osm_gps_map_osd_shape_shadow(cr); + osm_gps_map_osd_dpad_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW); + osm_gps_map_osd_shape_shadow(cr); + + /* --------- draw zoom and dpad shape ----------- */ + + osm_gps_map_osd_zoom_shape(cr, x, y); + osm_gps_map_osd_shape(cr); + osm_gps_map_osd_dpad_shape(cr, x, y); + osm_gps_map_osd_shape(cr); + + /* --------- draw zoom and dpad labels --------- */ + + osm_gps_map_osd_zoom_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW); + osm_gps_map_osd_dpad_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW); + osm_gps_map_osd_labels_shadow(cr, Z_RAD/3); + osm_gps_map_osd_dpad_gps(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW); + osm_gps_map_osd_labels_shadow(cr, Z_RAD/6); + + osm_gps_map_osd_zoom_labels(cr, x, y); + osm_gps_map_osd_dpad_labels(cr, x, y); + osm_gps_map_osd_labels(cr, Z_RAD/3); + osm_gps_map_osd_dpad_gps(cr, x, y); + osm_gps_map_osd_labels(cr, Z_RAD/6); cairo_destroy(cr); @@ -1608,7 +1768,7 @@ osm_gps_map_print_images(map); osm_gps_map_draw_balloon_int(map); #ifdef ENABLE_OSD - osm_gps_map_draw_osd_controls(map, 0, 0); + osm_gps_map_osd_draw_controls(map, 0, 0); #endif //osm_gps_map_osd_speed(map, 1.5); @@ -2038,6 +2198,15 @@ return FALSE; } +#ifdef ENABLE_OSD + /* also don't drag on clicks into the control OSD */ + if(osm_gps_map_osd_check(event->x, event->y) != OSD_NONE) + { + priv->drag_counter = -1; + return FALSE; + } +#endif + priv->drag_counter = 0; priv->drag_start_mouse_x = (int) event->x; priv->drag_start_mouse_y = (int) event->y; @@ -2052,6 +2221,50 @@ { OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget); +#ifdef ENABLE_OSD + /* released inside OSD control? */ + osd_button_t but = osm_gps_map_osd_check(event->x, event->y); + if(but != OSD_NONE) + { + switch(but) { + case OSD_UP: + priv->map_y -= GTK_WIDGET(widget)->allocation.height/4; + priv->center_coord_set = FALSE; + break; + + case OSD_DOWN: + priv->map_y += GTK_WIDGET(widget)->allocation.height/4; + priv->center_coord_set = FALSE; + break; + + case OSD_LEFT: + priv->map_x -= GTK_WIDGET(widget)->allocation.width/4; + priv->center_coord_set = FALSE; + break; + + case OSD_RIGHT: + priv->map_x += GTK_WIDGET(widget)->allocation.width/4; + priv->center_coord_set = FALSE; + break; + + case OSD_IN: + osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1); + break; + + case OSD_OUT: + osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1); + break; + + default: + break; + } + + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + + return FALSE; + } +#endif + /* released inside the balloon? */ if (osm_gps_map_in_balloon(priv, event->x + EXTRA_BORDER, @@ -2060,12 +2273,8 @@ osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget), event->x - priv->balloon.rect.x + EXTRA_BORDER, event->y - priv->balloon.rect.y + EXTRA_BORDER); - return FALSE; } - if (priv->drag_counter < 0) - return FALSE; - if (priv->dragging) { priv->dragging = FALSE; @@ -2130,7 +2339,7 @@ osm_gps_map_osd_restore (OSM_GPS_MAP(widget)); /* draw new OSD */ - osm_gps_map_draw_osd_controls (OSM_GPS_MAP(widget), + osm_gps_map_osd_draw_controls (OSM_GPS_MAP(widget), -priv->drag_mouse_dx, -priv->drag_mouse_dy); #endif