#include <gdk/gdkx.h>
#include "grr_board_view.h"
+#include "grr_icon.h"
#include "grr_util.h"
#define SCROLL_DELAY_LENGTH 300
#define GRR_SVG_ASSUMED_WIDTH 32.0
#define GRR_SVG_ASSUMED_HEIGHT 32.0
-#define GRR_CELL_SVG "svg/cell.svg"
-#define GRR_WALL_SVG "svg/wall.svg"
-
-#define GRR_ROBOT_BLUE_SVG "svg/robot_blue.svg"
-#define GRR_ROBOT_GREEN_SVG "svg/robot_green.svg"
-#define GRR_ROBOT_RED_SVG "svg/robot_red.svg"
-#define GRR_ROBOT_YELLOW_SVG "svg/robot_yellow.svg"
-
-#define GRR_TARGET_BLUE_CIRCLE_SVG "svg/target_blue_circle.svg"
-#define GRR_TARGET_BLUE_OCTAGON_SVG "svg/target_blue_octagon.svg"
-#define GRR_TARGET_BLUE_SQUARE_SVG "svg/target_blue_square.svg"
-#define GRR_TARGET_BLUE_TRIANGLE_SVG "svg/target_blue_triangle.svg"
-
-#define GRR_TARGET_GREEN_CIRCLE_SVG "svg/target_green_circle.svg"
-#define GRR_TARGET_GREEN_OCTAGON_SVG "svg/target_green_octagon.svg"
-#define GRR_TARGET_GREEN_SQUARE_SVG "svg/target_green_square.svg"
-#define GRR_TARGET_GREEN_TRIANGLE_SVG "svg/target_green_triangle.svg"
-
-#define GRR_TARGET_RED_CIRCLE_SVG "svg/target_red_circle.svg"
-#define GRR_TARGET_RED_OCTAGON_SVG "svg/target_red_octagon.svg"
-#define GRR_TARGET_RED_SQUARE_SVG "svg/target_red_square.svg"
-#define GRR_TARGET_RED_TRIANGLE_SVG "svg/target_red_triangle.svg"
-
-#define GRR_TARGET_YELLOW_CIRCLE_SVG "svg/target_yellow_circle.svg"
-#define GRR_TARGET_YELLOW_OCTAGON_SVG "svg/target_yellow_octagon.svg"
-#define GRR_TARGET_YELLOW_SQUARE_SVG "svg/target_yellow_square.svg"
-#define GRR_TARGET_YELLOW_TRIANGLE_SVG "svg/target_yellow_triangle.svg"
-
-#define GRR_TARGET_WHIRL_SVG "svg/target_whirl.svg"
-
-
/* Forward declarations */
static void grr_board_view_class_init (grr_board_view_class_t *klass);
static void
grr_board_view_init (grr_board_view_t *view)
{
+ int i;
+ rr_robot_t robot;
+ rr_target_t target;
+
view->board = NULL;
view->client = NULL;
view->button = 0;
view->timer = 0;
+
+ view->cell_width = 0;
+ view->cell_height = 0;
+
+ view->cell_icon = grr_icon_create ("cell");
+ view->wall_icon = grr_icon_create ("wall");
+
+ for (i=0; i < RR_NUM_ROBOTS; i++) {
+ robot = rr_robot_from_idx (i);
+ view->robot_icon[i] = grr_icon_create (grr_icon_robot_name (robot));
+ }
+
+ for (i=0; i < RR_NUM_TARGETS; i++) {
+ target = rr_target_from_idx (i);
+ view->target_icon[i] = grr_icon_create (grr_icon_target_name (target));
+ }
}
GtkWidget*
}
static void
-grr_svg_draw (XrState *xrs, char *svg)
+grr_board_view_draw_walls (grr_board_view_t *view,
+ XrState *xrs,
+ rr_wall_t wall)
{
- xsvg_status_t status;
- xsvg_t *xsvg;
-
- status = xsvg_create (&xsvg);
- if (status) {
- fprintf (stderr, "xsvg_create error\n");
- return;
- }
- status = xsvg_parse_file (xsvg, svg);
- if (status) {
- fprintf (stderr, "xsvg_parse_file error parsing %s\n", svg);
- return;
- }
- xsvg_render (xsvg, xrs);
- if (status) {
- fprintf (stderr, "xsvg_render error\n");
- return;
- }
- xsvg_destroy (xsvg);
-}
-
-static void
-grr_wall_draw (XrState *xrs, rr_wall_t wall)
-{
- char *wall_svg = GRR_WALL_SVG;
-
if (wall == RR_WALL_NONE)
return;
if (wall & RR_WALL_ABOVE) {
- grr_svg_draw (xrs, wall_svg);
+ grr_icon_draw (view->wall_icon, xrs);
}
if (wall & RR_WALL_LEFT) {
XrSave (xrs);
XrRotate (xrs, M_PI_2);
- grr_svg_draw (xrs, wall_svg);
+ grr_icon_draw (view->wall_icon, xrs);
XrRestore (xrs);
}
if (wall & RR_WALL_RIGHT) {
XrSave (xrs);
XrTranslate (xrs, GRR_SVG_ASSUMED_WIDTH, 0);
XrRotate (xrs, M_PI_2);
- grr_svg_draw (xrs, wall_svg);
+ grr_icon_draw (view->wall_icon, xrs);
XrRestore (xrs);
}
if (wall & RR_WALL_BELOW) {
XrSave (xrs);
XrTranslate (xrs, 0, GRR_SVG_ASSUMED_HEIGHT);
- grr_svg_draw (xrs, wall_svg);
+ grr_icon_draw (view->wall_icon, xrs);
XrRestore (xrs);
}
}
static void
-grr_target_draw (XrState *xrs, rr_target_t target)
-{
- char *target_svg;
-
- if (target == RR_TARGET_NONE)
- return;
-
- switch (target) {
- case RR_TARGET_BLUE_CIRCLE:
- target_svg = GRR_TARGET_BLUE_CIRCLE_SVG;
- break;
- case RR_TARGET_BLUE_OCTAGON:
- target_svg = GRR_TARGET_BLUE_OCTAGON_SVG;
- break;
- case RR_TARGET_BLUE_SQUARE:
- target_svg = GRR_TARGET_BLUE_SQUARE_SVG;
- break;
- case RR_TARGET_BLUE_TRIANGLE:
- target_svg = GRR_TARGET_BLUE_TRIANGLE_SVG;
- break;
- case RR_TARGET_GREEN_CIRCLE:
- target_svg = GRR_TARGET_GREEN_CIRCLE_SVG;
- break;
- case RR_TARGET_GREEN_OCTAGON:
- target_svg = GRR_TARGET_GREEN_OCTAGON_SVG;
- break;
- case RR_TARGET_GREEN_SQUARE:
- target_svg = GRR_TARGET_GREEN_SQUARE_SVG;
- break;
- case RR_TARGET_GREEN_TRIANGLE:
- target_svg = GRR_TARGET_GREEN_TRIANGLE_SVG;
- break;
- case RR_TARGET_RED_CIRCLE:
- target_svg = GRR_TARGET_RED_CIRCLE_SVG;
- break;
- case RR_TARGET_RED_OCTAGON:
- target_svg = GRR_TARGET_RED_OCTAGON_SVG;
- break;
- case RR_TARGET_RED_SQUARE:
- target_svg = GRR_TARGET_RED_SQUARE_SVG;
- break;
- case RR_TARGET_RED_TRIANGLE:
- target_svg = GRR_TARGET_RED_TRIANGLE_SVG;
- break;
- case RR_TARGET_YELLOW_CIRCLE:
- target_svg = GRR_TARGET_YELLOW_CIRCLE_SVG;
- break;
- case RR_TARGET_YELLOW_OCTAGON:
- target_svg = GRR_TARGET_YELLOW_OCTAGON_SVG;
- break;
- case RR_TARGET_YELLOW_SQUARE:
- target_svg = GRR_TARGET_YELLOW_SQUARE_SVG;
- break;
- case RR_TARGET_YELLOW_TRIANGLE:
- target_svg = GRR_TARGET_YELLOW_TRIANGLE_SVG;
- break;
- case RR_TARGET_WHIRL:
- target_svg = GRR_TARGET_WHIRL_SVG;
- break;
- default:
- return;
- }
-
- grr_svg_draw (xrs, target_svg);
-}
-
-static void
-grr_robot_draw (XrState *xrs, rr_robot_t robot)
-{
- char *robot_svg;
-
- if (robot == RR_ROBOT_NONE)
- return;
-
- switch (robot) {
- case RR_ROBOT_BLUE:
- robot_svg = GRR_ROBOT_BLUE_SVG;
- break;
- case RR_ROBOT_GREEN:
- robot_svg = GRR_ROBOT_GREEN_SVG;
- break;
- case RR_ROBOT_RED:
- robot_svg = GRR_ROBOT_RED_SVG;
- break;
- case RR_ROBOT_YELLOW:
- robot_svg = GRR_ROBOT_YELLOW_SVG;
- break;
- default:
- return;
- }
-
- grr_svg_draw (xrs, robot_svg);
-}
-
-static void
-grr_cell_draw (XrState *xrs, rr_cell_t cell, rr_target_t goal,
- int width, int height)
+grr_board_view_draw_cell (grr_board_view_t *view,
+ XrState *xrs,
+ rr_cell_t cell,
+ rr_target_t goal,
+ int width,
+ int height)
{
int xpad, ypad;
+ rr_robot_t robot;
rr_target_t target;
XrSave (xrs);
XrScale (xrs,
width / GRR_SVG_ASSUMED_WIDTH,
height / GRR_SVG_ASSUMED_HEIGHT);
- grr_svg_draw (xrs, GRR_CELL_SVG);
- grr_wall_draw (xrs, RR_CELL_GET_WALLS (cell));
+ grr_icon_draw (view->cell_icon, xrs);
+ grr_board_view_draw_walls (view, xrs, RR_CELL_GET_WALLS (cell));
XrRestore (xrs);
xpad = width / 5;
(height - 2*ypad) / GRR_SVG_ASSUMED_HEIGHT);
target = RR_CELL_GET_TARGET (cell);
- grr_target_draw (xrs, target);
+ if (target)
+ grr_icon_draw (view->target_icon[rr_target_idx (target)], xrs);
+
XrRestore (xrs);
- /* This is a hack, (it obscures the cell background in addition to
- the target). The real way to do this is to draw the target
- itself with less opacity. */
+ /* XXX: This is a kludge, (it obscures the cell background in
+ addition to the target). The real way to do this is to draw the
+ target itself with less opacity. */
if (target && target != goal) {
XrSave (xrs);
XrScale (xrs,
(width - 2*xpad) / GRR_SVG_ASSUMED_WIDTH,
(height - 2*ypad) / GRR_SVG_ASSUMED_HEIGHT);
- grr_robot_draw (xrs, RR_CELL_GET_ROBOT (cell));
+ robot = RR_CELL_GET_ROBOT (cell);
+ if (robot)
+ grr_icon_draw (view->robot_icon[rr_robot_idx (robot)], xrs);
XrRestore (xrs);
gint x_off, y_off;
int i, j;
rr_target_t goal_target;
+ int new_cell_width, new_cell_height;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GRR_IS_BOARD_VIEW (widget), FALSE);
/* Ignore GTK+ and use Xr for drawing. */
xrs = XrCreate ();
XrSetTargetDrawable (xrs, dpy, drawable);
- XrTranslate (xrs, -x_off, -y_off);
rr_board_get_size (board, &view->board_width, &view->board_height);
- view->cell_width = widget->allocation.width / view->board_width;
- if (view->cell_width == 0)
- view->cell_width = 1;
- view->cell_height = widget->allocation.height / view->board_height;
- if (view->cell_height == 0)
- view->cell_height = 1;
+ new_cell_width = widget->allocation.width / view->board_width;
+ if (new_cell_width == 0)
+ new_cell_width = 1;
+ new_cell_height = widget->allocation.height / view->board_height;
+ if (new_cell_height == 0)
+ new_cell_height = 1;
+
+ view->cell_width = new_cell_width;
+ view->cell_height = new_cell_height;
+
+ /* Pre-render icons if the size has changed */
+ /* XXX: This code isn't fully baked yet
+ if (new_cell_width != view->cell_width
+ || new_cell_height != view->cell_height) {
+ int i;
+ rr_robot_t robot;
+ rr_target_t target;
+
+ view->cell_width = new_cell_width;
+ view->cell_height = new_cell_height;
+
+ XrSave (xrs);
+ XrScale (xrs,
+ view->cell_width / GRR_SVG_ASSUMED_WIDTH,
+ view->cell_height / GRR_SVG_ASSUMED_HEIGHT);
+
+ grr_icon_predraw (view->cell_icon, xrs,
+ view->cell_width, view->cell_height);
+
+ grr_icon_predraw (view->wall_icon, xrs,
+ view->cell_width, view->cell_height);
+
+ for (i=0; i < RR_NUM_ROBOTS; i++) {
+ robot = rr_robot_from_idx (i);
+ grr_icon_predraw (view->robot_icon[i], xrs,
+ view->cell_width, view->cell_height);
+ }
+
+ for (i=0; i < RR_NUM_TARGETS; i++) {
+ target = rr_target_from_idx (i);
+ grr_icon_predraw (view->target_icon[i], xrs,
+ view->cell_width, view->cell_height);
+ }
+
+ XrRestore (xrs);
+ }
+ */
+
+ XrTranslate (xrs, -x_off, -y_off);
view->board_pad_x = (widget->allocation.width - view->board_width * view->cell_width) / 2;
view->board_pad_y = (widget->allocation.height - view->board_height * view->cell_height) / 2;
for (i=0; i < view->board_width; i++) {
XrSave (xrs);
XrTranslate (xrs, i * view->cell_width, j * view->cell_height);
- grr_cell_draw (xrs,
- rr_board_get_cell (board, i, j),
- goal_target,
- view->cell_width, view->cell_height);
+ grr_board_view_draw_cell (view, xrs,
+ rr_board_get_cell (board, i, j),
+ goal_target,
+ view->cell_width, view->cell_height);
XrRestore (xrs);
}
}
XrTranslate (xrs,
(view->board_width / 2 - 1) * view->cell_width,
(view->board_height / 2 - 1) * view->cell_height);
- grr_cell_draw (xrs, goal_target, goal_target,
- view->cell_width * 2, view->cell_height * 2);
+ grr_board_view_draw_cell (view, xrs, goal_target, goal_target,
+ view->cell_width * 2, view->cell_height * 2);
}
XrRestore (xrs);
XrScale (xrs,
view->cell_width / GRR_SVG_ASSUMED_WIDTH,
view->cell_height / GRR_SVG_ASSUMED_HEIGHT);
- grr_wall_draw (xrs, RR_CELL_GET_WALLS (rr_board_get_cell(board, i, j)));
+ grr_board_view_draw_walls (view, xrs, RR_CELL_GET_WALLS (rr_board_get_cell(board, i, j)));
XrRestore (xrs);
}
}
projects / grrobot / blobdiff