COL_GRID,
COL_DIAG,
COL_HINT,
+ COL_CURSOR,
NCOLOURS
};
static void decode_params(game_params *ret, char const *string)
{
ret->w = ret->h = atoi(string);
- while (*string && isdigit(*string)) string++;
+ while (*string && isdigit((unsigned char)*string)) string++;
if (*string == 'x') {
string++;
ret->h = atoi(string);
- while (*string && isdigit(*string)) string++;
+ while (*string && isdigit((unsigned char)*string)) string++;
}
if (*string == 'r') {
string++;
return ret;
}
-static char *validate_params(game_params *params)
+static char *validate_params(game_params *params, int full)
{
if (params->w <= 0 || params->h <= 0)
return "Width and height must both be greater than zero";
return NULL;
}
+struct game_ui {
+ int cx, cy, cdraw;
+};
+
static game_ui *new_ui(game_state *state)
{
- return NULL;
+ game_ui *ui = snew(game_ui);
+ ui->cx = ui->cy = ui->cdraw = 0;
+ return ui;
}
static void free_ui(game_ui *ui)
{
+ sfree(ui);
}
static char *encode_ui(game_ui *ui)
int x, int y, int button)
{
int w = state->w, h = state->h /*, wh = w * h */;
- char buf[80];
+ char buf[80], *nullret = NULL;
+
+ if (button == LEFT_BUTTON || button == CURSOR_SELECT ||
+ button == ' ' || button == '\r' || button == '\n') {
+ int tx, ty;
+ if (button == LEFT_BUTTON) {
+ tx = FROMCOORD(x), ty = FROMCOORD(y);
+ ui->cdraw = 0;
+ } else {
+ tx = ui->cx; ty = ui->cy;
+ ui->cdraw = 1;
+ }
+ nullret = "";
- if (button == LEFT_BUTTON) {
- int tx = FROMCOORD(x), ty = FROMCOORD(y);
if (tx >= 0 && tx < w && ty >= 0 && ty < h) {
sprintf(buf, "M%d,%d", tx, ty);
return dupstr(buf);
}
}
+ else if (button == CURSOR_UP || button == CURSOR_DOWN ||
+ button == CURSOR_RIGHT || button == CURSOR_LEFT) {
+ int dx = 0, dy = 0;
+ switch (button) {
+ case CURSOR_UP: dy = -1; break;
+ case CURSOR_DOWN: dy = 1; break;
+ case CURSOR_RIGHT: dx = 1; break;
+ case CURSOR_LEFT: dx = -1; break;
+ default: assert(!"shouldn't get here");
+ }
+ ui->cx += dx; ui->cy += dy;
+ ui->cx = min(max(ui->cx, 0), state->w - 1);
+ ui->cy = min(max(ui->cy, 0), state->h - 1);
+ ui->cdraw = 1;
+ nullret = "";
+ }
- return NULL;
+ return nullret;
}
static game_state *execute_move(game_state *from, char *move)
* Drawing routines.
*/
-static void game_size(game_params *params, game_drawstate *ds,
- int *x, int *y, int expand)
+static void game_compute_size(game_params *params, int tilesize,
+ int *x, int *y)
{
- double tsx, tsy, ts;
- /*
- * Each window dimension equals the tile size times one more
- * than the grid dimension (the border is half the width of the
- * tiles).
- */
- tsx = (double)*x / ((double)params->w + 1.0);
- tsy = (double)*y / ((double)params->h + 1);
- ts = min(tsx, tsy);
- if (expand)
- ds->tilesize = (int)(ts + 0.5);
- else
- ds->tilesize = min((int)ts, PREFERRED_TILE_SIZE);
+ /* Ick: fake up `ds->tilesize' for macro expansion purposes */
+ struct { int tilesize; } ads, *ds = &ads;
+ ads.tilesize = tilesize;
*x = TILE_SIZE * params->w + 2 * BORDER;
*y = TILE_SIZE * params->h + 2 * BORDER;
}
+static void game_set_size(game_drawstate *ds, game_params *params,
+ int tilesize)
+{
+ ds->tilesize = tilesize;
+}
+
static float *game_colours(frontend *fe, game_state *state, int *ncolours)
{
float *ret = snewn(3 * NCOLOURS, float);
ret[COL_HINT * 3 + 1] = 0.0F;
ret[COL_HINT * 3 + 2] = 0.0F;
+ ret[COL_CURSOR * 3 + 0] = 0.8F;
+ ret[COL_CURSOR * 3 + 1] = 0.0F;
+ ret[COL_CURSOR * 3 + 2] = 0.0F;
+
*ncolours = NCOLOURS;
return ret;
}
{
int w = ds->w, h = ds->h, wh = w * h;
int bx = x * TILE_SIZE + BORDER, by = y * TILE_SIZE + BORDER;
- int i, j;
+ int i, j, dcol = (tile & 4) ? COL_CURSOR : COL_DIAG;
clip(fe, bx+1, by+1, TILE_SIZE-1, TILE_SIZE-1);
if (animtime < 0.5)
colour = COL_WRONG + COL_RIGHT - colour;
- draw_polygon(fe, coords, 4, TRUE, colour);
- draw_polygon(fe, coords, 4, FALSE, COL_GRID);
+ draw_polygon(fe, coords, 4, colour, COL_GRID);
}
/*
int cx = (bx + TILE_SIZE/2) + (2 * ox - 1) * td;
int cy = (by + TILE_SIZE/2) + (2 * oy - 1) * td;
if (ox == 0 && oy == 0)
- draw_rect(fe, cx, cy, 2*td+1, 2*td+1, COL_DIAG);
+ draw_rect(fe, cx, cy, 2*td+1, 2*td+1, dcol);
else {
- draw_line(fe, cx, cy, cx+2*td, cy, COL_DIAG);
- draw_line(fe, cx, cy+2*td, cx+2*td, cy+2*td, COL_DIAG);
- draw_line(fe, cx, cy, cx, cy+2*td, COL_DIAG);
- draw_line(fe, cx+2*td, cy, cx+2*td, cy+2*td, COL_DIAG);
+ draw_line(fe, cx, cy, cx+2*td, cy, dcol);
+ draw_line(fe, cx, cy+2*td, cx+2*td, cy+2*td, dcol);
+ draw_line(fe, cx, cy, cx, cy+2*td, dcol);
+ draw_line(fe, cx+2*td, cy, cx+2*td, cy+2*td, dcol);
}
}
if (!state->hints_active)
v &= ~2;
+ if (ui->cdraw && ui->cx == x && ui->cy == y)
+ v |= 4;
if (oldstate && state->grid[i] != oldstate->grid[i])
vv = 255; /* means `animated' */
return TRUE;
}
-static int game_timing_state(game_state *state)
+static int game_timing_state(game_state *state, game_ui *ui)
{
return TRUE;
}
game_changed_state,
interpret_move,
execute_move,
- game_size,
+ PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
game_colours,
game_new_drawstate,
game_free_drawstate,