From 818a8d29d02d6e715d02cf3d4cf64c1e730197a6 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Fri, 1 Aug 2003 01:46:26 +0000 Subject: [PATCH] New, lovely octagon targets from Richard. Made inactive targets a bit darker. --- ltmain.sh | 2 ++ src/grr_board_view.c | 4 ++++ src/grr_board_view.h | 5 ++++ src/svg/grr_icon_svg.h | 8 +++---- src/svg/target_blue_octagon.svg | 40 ++++++++++++++++++++++++++----- src/svg/target_green_octagon.svg | 40 ++++++++++++++++++++++++++----- src/svg/target_red_octagon.svg | 40 ++++++++++++++++++++++++++----- src/svg/target_yellow_octagon.svg | 40 ++++++++++++++++++++++++++----- 8 files changed, 151 insertions(+), 28 deletions(-) diff --git a/ltmain.sh b/ltmain.sh index fe83ff4..b0f592c 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -24,6 +24,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +max_cmd_len=2049 + # Check that we have a working $echo. if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. diff --git a/src/grr_board_view.c b/src/grr_board_view.c index 66a2617..43c269b 100644 --- a/src/grr_board_view.c +++ b/src/grr_board_view.c @@ -451,7 +451,11 @@ grr_board_view_expose (GtkWidget *widget, if (target) { if (target && target != goal_target) { cairo_save (xrs); + cairo_set_alpha (xrs, .25); + cairo_set_operator (xrs, CAIRO_OPERATOR_XOR); + grr_icon_draw_predrawn (view->target_icon[rr_target_idx (target)], xrs); cairo_set_alpha (xrs, 0.25); + cairo_set_operator (xrs, CAIRO_OPERATOR_OVER); grr_icon_draw_predrawn (view->target_icon[rr_target_idx (target)], xrs); cairo_restore (xrs); } else { diff --git a/src/grr_board_view.h b/src/grr_board_view.h index 13cd99b..2f7ebbe 100644 --- a/src/grr_board_view.h +++ b/src/grr_board_view.h @@ -109,6 +109,11 @@ grr_board_view_transform_pixel_to_cell (grr_board_view_t *view, int pixel_x, int pixel_y, int *cell_x, int *cell_y); +void +grr_board_view_transform_cell_to_pixel (grr_board_view_t *view, + int cell_x, int cell_y, + int *pixel_x, int *pixel_y); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/svg/grr_icon_svg.h b/src/svg/grr_icon_svg.h index 8fcd551..d8e4311 100644 --- a/src/svg/grr_icon_svg.h +++ b/src/svg/grr_icon_svg.h @@ -5,20 +5,20 @@ static char GRR_ICON_SVG_ROBOT_GREEN[] = "\015\012\015\012\015\012\015\012\011Tux\015\012\011The\040Linux\040Penguin\040in\040SVG.\015\012\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_ROBOT_YELLOW[] = "\015\012\015\012\015\012\015\012\011Tux\015\012\011The\040Linux\040Penguin\040in\040SVG.\015\012\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_TARGET_BLUE_CIRCLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_BLUE_OCTAGON[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_BLUE_OCTAGON[] = "\015\012\015\012\015\012\011\015\012\011\015\012]>\015\012\015\012\011\015\012\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_TARGET_BLUE_SQUARE[] = "\015\012\015\012\015\012\011\015\012\011\015\012]>\015\012\015\012\011\015\012\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_TARGET_BLUE_TRIANGLE[] = "\012\012\012\040\040\012\012"; static char GRR_ICON_SVG_TARGET_GREEN_CIRCLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_GREEN_OCTAGON[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_GREEN_OCTAGON[] = "\015\012\015\012\015\012\011\015\012\011\015\012]>\015\012\015\012\011\015\012\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_TARGET_GREEN_SQUARE[] = "\015\012\015\012\015\012\011\015\012\011\015\012]>\015\012\015\012\011\015\012\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_TARGET_GREEN_TRIANGLE[] = "\012\012\012\040\040\012\012"; static char GRR_ICON_SVG_TARGET_RED_CIRCLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_RED_OCTAGON[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_RED_OCTAGON[] = "\015\012\015\012\015\012\011\015\012\011\015\012]>\015\012\015\012\011\015\012\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_TARGET_RED_SQUARE[] = "\015\012\015\012\015\012\011\015\012\011\015\012]>\015\012\015\012\011\015\012\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_TARGET_RED_TRIANGLE[] = "\012\012\012\040\040\012\012"; static char GRR_ICON_SVG_TARGET_WHIRL[] = "\012\012\012\040\040\012\040\040\012\040\040\012\040\040\012\012\012"; static char GRR_ICON_SVG_TARGET_YELLOW_CIRCLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_YELLOW_OCTAGON[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_YELLOW_OCTAGON[] = "\015\012\015\012\015\012\011\015\012\011\015\012]>\015\012\015\012\011\015\012\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_TARGET_YELLOW_SQUARE[] = "\015\012\015\012\015\012\011\015\012\011\015\012]>\015\012\015\012\011\015\012\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_TARGET_YELLOW_TRIANGLE[] = "\012\012\012\040\040\012\012"; static char GRR_ICON_SVG_WALL[] = "\012\012\012\040\040\012\012"; diff --git a/src/svg/target_blue_octagon.svg b/src/svg/target_blue_octagon.svg index 94d2797..29835e1 100644 --- a/src/svg/target_blue_octagon.svg +++ b/src/svg/target_blue_octagon.svg @@ -1,6 +1,34 @@ - - - - - + + + + + +]> + + + + + + + + + + + + + + + + + diff --git a/src/svg/target_green_octagon.svg b/src/svg/target_green_octagon.svg index 194a8a7..47bb5ed 100644 --- a/src/svg/target_green_octagon.svg +++ b/src/svg/target_green_octagon.svg @@ -1,6 +1,34 @@ - - - - - + + + + + +]> + + + + + + + + + + + + + + + + + diff --git a/src/svg/target_red_octagon.svg b/src/svg/target_red_octagon.svg index 93d3706..4e3c4b7 100644 --- a/src/svg/target_red_octagon.svg +++ b/src/svg/target_red_octagon.svg @@ -1,6 +1,34 @@ - - - - - + + + + + +]> + + + + + + + + + + + + + + + + + diff --git a/src/svg/target_yellow_octagon.svg b/src/svg/target_yellow_octagon.svg index 5c18259..dbbc4cf 100644 --- a/src/svg/target_yellow_octagon.svg +++ b/src/svg/target_yellow_octagon.svg @@ -1,6 +1,34 @@ - - - - - + + + + + +]> + + + + + + + + + + + + + + + + + -- 2.43.0