X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/871bf2946c5cbfdc7621c4b3d6850af0699297a0..dc1ccafea10b0d992a086c640564a6bd51ced66d:/twiddle.c diff --git a/twiddle.c b/twiddle.c index fc12411..8c97a70 100644 --- a/twiddle.c +++ b/twiddle.c @@ -31,6 +31,7 @@ enum { COL_HIGHLIGHT_GENTLE, COL_LOWLIGHT, COL_LOWLIGHT_GENTLE, + COL_HIGHCURSOR, COL_LOWCURSOR, NCOLOURS }; @@ -46,7 +47,6 @@ struct game_state { int orientable; int *grid; int completed; - int just_used_solve; /* used to suppress undo animation */ int used_solve; /* used to suppress completion flash */ int movecount, movetarget; int lastx, lasty, lastr; /* coordinates of last rotation */ @@ -108,16 +108,16 @@ static void decode_params(game_params *ret, char const *string) ret->n = 2; ret->rowsonly = ret->orientable = FALSE; ret->movetarget = 0; - 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 == 'n') { string++; ret->n = atoi(string); - while (*string && isdigit(*string)) string++; + while (*string && isdigit((unsigned char)*string)) string++; } while (*string) { if (*string == 'r') { @@ -127,7 +127,7 @@ static void decode_params(game_params *ret, char const *string) } else if (*string == 'm') { string++; ret->movetarget = atoi(string); - while (string[1] && isdigit(string[1])) string++; + while (string[1] && isdigit((unsigned char)string[1])) string++; } string++; } @@ -209,7 +209,7 @@ static game_params *custom_params(config_item *cfg) return ret; } -static char *validate_params(game_params *params) +static char *validate_params(game_params *params, int full) { if (params->n < 2) return "Rotation radius must be at least two"; @@ -460,7 +460,7 @@ static char *validate_desc(game_params *params, char *desc) return NULL; } -static game_state *new_game(midend_data *me, game_params *params, char *desc) +static game_state *new_game(midend *me, game_params *params, char *desc) { game_state *state = snew(game_state); int w = params->w, h = params->h, n = params->n, wh = w*h; @@ -472,7 +472,7 @@ static game_state *new_game(midend_data *me, game_params *params, char *desc) state->n = n; state->orientable = params->orientable; state->completed = 0; - state->used_solve = state->just_used_solve = FALSE; + state->used_solve = FALSE; state->movecount = 0; state->movetarget = params->movetarget; state->lastx = state->lasty = state->lastr = -1; @@ -515,7 +515,6 @@ static game_state *dup_game(game_state *state) ret->lasty = state->lasty; ret->lastr = state->lastr; ret->used_solve = state->used_solve; - ret->just_used_solve = state->just_used_solve; ret->grid = snewn(ret->w * ret->h, int); memcpy(ret->grid, state->grid, ret->w * ret->h * sizeof(int)); @@ -547,6 +546,11 @@ static char *solve_game(game_state *state, game_state *currstate, return dupstr("S"); } +static int game_can_format_as_text_now(game_params *params) +{ + return TRUE; +} + static char *game_text_format(game_state *state) { char *ret, *p, buf[80]; @@ -594,13 +598,25 @@ static char *game_text_format(game_state *state) return ret; } +struct game_ui { + int cur_x, cur_y; + int cur_visible; +}; + static game_ui *new_ui(game_state *state) { - return NULL; + game_ui *ui = snew(game_ui); + + ui->cur_x = 0; + ui->cur_y = 0; + ui->cur_visible = FALSE; + + return ui; } static void free_ui(game_ui *ui) { + sfree(ui); } static char *encode_ui(game_ui *ui) @@ -622,6 +638,7 @@ struct game_drawstate { int w, h, bgcolour; int *grid; int tilesize; + int cur_x, cur_y; }; static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, @@ -633,6 +650,19 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, button = button & (~MOD_MASK | MOD_NUM_KEYPAD); + if (IS_CURSOR_MOVE(button)) { + if (button == CURSOR_LEFT && ui->cur_x > 0) + ui->cur_x--; + if (button == CURSOR_RIGHT && (ui->cur_x+n) < (w)) + ui->cur_x++; + if (button == CURSOR_UP && ui->cur_y > 0) + ui->cur_y--; + if (button == CURSOR_DOWN && (ui->cur_y+n) < (h)) + ui->cur_y++; + ui->cur_visible = 1; + return ""; + } + if (button == LEFT_BUTTON || button == RIGHT_BUTTON) { /* * Determine the coordinates of the click. We offset by n-1 @@ -646,6 +676,16 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, dir = (button == LEFT_BUTTON ? 1 : -1); if (x < 0 || x > w-n || y < 0 || y > h-n) return NULL; + ui->cur_visible = 0; + } else if (IS_CURSOR_SELECT(button)) { + if (ui->cur_visible) { + x = ui->cur_x; + y = ui->cur_y; + dir = (button == CURSOR_SELECT2) ? -1 : +1; + } else { + ui->cur_visible = 1; + return ""; + } } else if (button == 'a' || button == 'A' || button==MOD_NUM_KEYPAD+'7') { x = y = 0; dir = (button == 'A' ? -1 : +1); @@ -712,7 +752,7 @@ static game_state *execute_move(game_state *from, char *move) qsort(ret->grid, ret->w*ret->h, sizeof(int), compare_int); for (i = 0; i < ret->w*ret->h; i++) ret->grid[i] &= ~3; - ret->used_solve = ret->just_used_solve = TRUE; + ret->used_solve = TRUE; ret->completed = ret->movecount = 1; return ret; @@ -724,7 +764,6 @@ static game_state *execute_move(game_state *from, char *move) return NULL; /* can't parse this move string */ ret = dup_game(from); - ret->just_used_solve = FALSE; /* zero this in a hurry */ ret->movecount++; do_rotate(ret->grid, w, h, n, ret->orientable, x, y, dir); ret->lastx = x; @@ -744,61 +783,47 @@ 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.0); - 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 float *game_colours(frontend *fe, game_state *state, int *ncolours) +static void game_set_size(drawing *dr, game_drawstate *ds, + game_params *params, int tilesize) +{ + ds->tilesize = tilesize; +} + +static float *game_colours(frontend *fe, int *ncolours) { float *ret = snewn(3 * NCOLOURS, float); int i; - float max; - frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]); + game_mkhighlight(fe, ret, COL_BACKGROUND, COL_HIGHLIGHT, COL_LOWLIGHT); - /* - * Drop the background colour so that the highlight is - * noticeably brighter than it while still being under 1. - */ - max = ret[COL_BACKGROUND*3]; - for (i = 1; i < 3; i++) - if (ret[COL_BACKGROUND*3+i] > max) - max = ret[COL_BACKGROUND*3+i]; - if (max * 1.2F > 1.0F) { - for (i = 0; i < 3; i++) - ret[COL_BACKGROUND*3+i] /= (max * 1.2F); - } + /* cursor is light-background with a red tinge. */ + ret[COL_HIGHCURSOR * 3 + 0] = ret[COL_BACKGROUND * 3 + 0] * 1.0F; + ret[COL_HIGHCURSOR * 3 + 1] = ret[COL_BACKGROUND * 3 + 1] * 0.5F; + ret[COL_HIGHCURSOR * 3 + 2] = ret[COL_BACKGROUND * 3 + 2] * 0.5F; for (i = 0; i < 3; i++) { - ret[COL_HIGHLIGHT * 3 + i] = ret[COL_BACKGROUND * 3 + i] * 1.2F; ret[COL_HIGHLIGHT_GENTLE * 3 + i] = ret[COL_BACKGROUND * 3 + i] * 1.1F; - ret[COL_LOWLIGHT * 3 + i] = ret[COL_BACKGROUND * 3 + i] * 0.8F; ret[COL_LOWLIGHT_GENTLE * 3 + i] = ret[COL_BACKGROUND * 3 + i] * 0.9F; ret[COL_TEXT * 3 + i] = 0.0; + ret[COL_LOWCURSOR * 3 + i] = ret[COL_HIGHCURSOR * 3 + i] * 0.6F; } *ncolours = NCOLOURS; return ret; } -static game_drawstate *game_new_drawstate(game_state *state) +static game_drawstate *game_new_drawstate(drawing *dr, game_state *state) { struct game_drawstate *ds = snew(struct game_drawstate); int i; @@ -811,11 +836,12 @@ static game_drawstate *game_new_drawstate(game_state *state) ds->tilesize = 0; /* haven't decided yet */ for (i = 0; i < ds->w*ds->h; i++) ds->grid[i] = -1; + ds->cur_x = ds->cur_y = -state->n; return ds; } -static void game_free_drawstate(game_drawstate *ds) +static void game_free_drawstate(drawing *dr, game_drawstate *ds) { sfree(ds->grid); sfree(ds); @@ -831,20 +857,25 @@ struct rotation { static void rotate(int *xy, struct rotation *rot) { if (rot) { - float xf = xy[0] - rot->ox, yf = xy[1] - rot->oy; + float xf = (float)xy[0] - rot->ox, yf = (float)xy[1] - rot->oy; float xf2, yf2; xf2 = rot->c * xf + rot->s * yf; yf2 = - rot->s * xf + rot->c * yf; - xy[0] = xf2 + rot->ox + 0.5; /* round to nearest */ - xy[1] = yf2 + rot->oy + 0.5; /* round to nearest */ + xy[0] = (int)(xf2 + rot->ox + 0.5); /* round to nearest */ + xy[1] = (int)(yf2 + rot->oy + 0.5); /* round to nearest */ } } -static void draw_tile(frontend *fe, game_drawstate *ds, game_state *state, +#define CUR_TOP 1 +#define CUR_RIGHT 2 +#define CUR_BOTTOM 4 +#define CUR_LEFT 8 + +static void draw_tile(drawing *dr, game_drawstate *ds, game_state *state, int x, int y, int tile, int flash_colour, - struct rotation *rot) + struct rotation *rot, unsigned cedges) { int coords[8]; char str[40]; @@ -860,7 +891,7 @@ static void draw_tile(frontend *fe, game_drawstate *ds, game_state *state, rot = NULL; if (rot) - clip(fe, rot->cx, rot->cy, rot->cw, rot->ch); + clip(dr, rot->cx, rot->cy, rot->cw, rot->ch); /* * We must draw each side of the tile's highlight separately, @@ -880,29 +911,29 @@ static void draw_tile(frontend *fe, game_drawstate *ds, game_state *state, coords[2] = x + TILE_SIZE - 1; coords[3] = y; rotate(coords+2, rot); - draw_polygon(fe, coords, 3, TRUE, rot ? rot->rc : COL_LOWLIGHT); - draw_polygon(fe, coords, 3, FALSE, rot ? rot->rc : COL_LOWLIGHT); + draw_polygon(dr, coords, 3, rot ? rot->rc : COL_LOWLIGHT, + rot ? rot->rc : (cedges & CUR_RIGHT) ? COL_LOWCURSOR : COL_LOWLIGHT); /* Bottom side. */ coords[2] = x; coords[3] = y + TILE_SIZE - 1; rotate(coords+2, rot); - draw_polygon(fe, coords, 3, TRUE, rot ? rot->bc : COL_LOWLIGHT); - draw_polygon(fe, coords, 3, FALSE, rot ? rot->bc : COL_LOWLIGHT); + draw_polygon(dr, coords, 3, rot ? rot->bc : COL_LOWLIGHT, + rot ? rot->bc : (cedges & CUR_BOTTOM) ? COL_LOWCURSOR : COL_LOWLIGHT); /* Left side. */ coords[0] = x; coords[1] = y; rotate(coords+0, rot); - draw_polygon(fe, coords, 3, TRUE, rot ? rot->lc : COL_HIGHLIGHT); - draw_polygon(fe, coords, 3, FALSE, rot ? rot->lc : COL_HIGHLIGHT); + draw_polygon(dr, coords, 3, rot ? rot->lc : COL_HIGHLIGHT, + rot ? rot->lc : (cedges & CUR_LEFT) ? COL_HIGHCURSOR : COL_HIGHLIGHT); /* Top side. */ coords[2] = x + TILE_SIZE - 1; coords[3] = y; rotate(coords+2, rot); - draw_polygon(fe, coords, 3, TRUE, rot ? rot->tc : COL_HIGHLIGHT); - draw_polygon(fe, coords, 3, FALSE, rot ? rot->tc : COL_HIGHLIGHT); + draw_polygon(dr, coords, 3, rot ? rot->tc : COL_HIGHLIGHT, + rot ? rot->tc : (cedges & CUR_TOP) ? COL_HIGHCURSOR : COL_HIGHLIGHT); /* * Now the main blank area in the centre of the tile. @@ -920,10 +951,9 @@ static void draw_tile(frontend *fe, game_drawstate *ds, game_state *state, coords[6] = x + TILE_SIZE - 1 - HIGHLIGHT_WIDTH; coords[7] = y + HIGHLIGHT_WIDTH; rotate(coords+6, rot); - draw_polygon(fe, coords, 4, TRUE, flash_colour); - draw_polygon(fe, coords, 4, FALSE, flash_colour); + draw_polygon(dr, coords, 4, flash_colour, flash_colour); } else { - draw_rect(fe, x + HIGHLIGHT_WIDTH, y + HIGHLIGHT_WIDTH, + draw_rect(dr, x + HIGHLIGHT_WIDTH, y + HIGHLIGHT_WIDTH, TILE_SIZE - 2*HIGHLIGHT_WIDTH, TILE_SIZE - 2*HIGHLIGHT_WIDTH, flash_colour); } @@ -967,22 +997,21 @@ static void draw_tile(frontend *fe, game_drawstate *ds, game_state *state, coords[4] = cx - displ * ydx; coords[5] = cy - displ * ydy; rotate(coords+4, rot); - draw_polygon(fe, coords, 3, TRUE, COL_LOWLIGHT_GENTLE); - draw_polygon(fe, coords, 3, FALSE, COL_LOWLIGHT_GENTLE); + draw_polygon(dr, coords, 3, COL_LOWLIGHT_GENTLE, COL_LOWLIGHT_GENTLE); } coords[0] = x + TILE_SIZE/2; coords[1] = y + TILE_SIZE/2; rotate(coords+0, rot); sprintf(str, "%d", tile / 4); - draw_text(fe, coords[0], coords[1], + draw_text(dr, coords[0], coords[1], FONT_VARIABLE, TILE_SIZE/3, ALIGN_VCENTRE | ALIGN_HCENTRE, COL_TEXT, str); if (rot) - unclip(fe); + unclip(dr); - draw_update(fe, x, y, TILE_SIZE, TILE_SIZE); + draw_update(dr, x, y, TILE_SIZE, TILE_SIZE); } static int highlight_colour(float angle) @@ -1028,11 +1057,7 @@ static int highlight_colour(float angle) static float game_anim_length(game_state *oldstate, game_state *newstate, int dir, game_ui *ui) { - if ((dir > 0 && newstate->just_used_solve) || - (dir < 0 && oldstate->just_used_solve)) - return 0.0F; - else - return ANIM_PER_RADIUS_UNIT * sqrt(newstate->n-1); + return (float)(ANIM_PER_RADIUS_UNIT * sqrt(newstate->n-1)); } static float game_flash_length(game_state *oldstate, game_state *newstate, @@ -1045,13 +1070,19 @@ static float game_flash_length(game_state *oldstate, game_state *newstate, return 0.0F; } -static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, +static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, game_state *state, int dir, game_ui *ui, float animtime, float flashtime) { int i, bgcolour; struct rotation srot, *rot; int lastx = -1, lasty = -1, lastr = -1; + int cx, cy, cmoved = 0, n = state->n; + + cx = ui->cur_visible ? ui->cur_x : -state->n; + cy = ui->cur_visible ? ui->cur_y : -state->n; + if (cx != ds->cur_x || cy != ds->cur_y) + cmoved = 1; if (flashtime > 0) { int frame = (int)(flashtime / FLASH_FRAME); @@ -1062,10 +1093,10 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, if (!ds->started) { int coords[10]; - draw_rect(fe, 0, 0, + draw_rect(dr, 0, 0, TILE_SIZE * state->w + 2 * BORDER, TILE_SIZE * state->h + 2 * BORDER, COL_BACKGROUND); - draw_update(fe, 0, 0, + draw_update(dr, 0, 0, TILE_SIZE * state->w + 2 * BORDER, TILE_SIZE * state->h + 2 * BORDER); @@ -1082,13 +1113,11 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, coords[9] = COORD(state->h) + HIGHLIGHT_WIDTH - 1; coords[6] = coords[8] + TILE_SIZE; coords[7] = coords[9] - TILE_SIZE; - draw_polygon(fe, coords, 5, TRUE, COL_HIGHLIGHT); - draw_polygon(fe, coords, 5, FALSE, COL_HIGHLIGHT); + draw_polygon(dr, coords, 5, COL_HIGHLIGHT, COL_HIGHLIGHT); coords[1] = COORD(0) - HIGHLIGHT_WIDTH; coords[0] = COORD(0) - HIGHLIGHT_WIDTH; - draw_polygon(fe, coords, 5, TRUE, COL_LOWLIGHT); - draw_polygon(fe, coords, 5, FALSE, COL_LOWLIGHT); + draw_polygon(dr, coords, 5, COL_LOWLIGHT, COL_LOWLIGHT); ds->started = TRUE; } @@ -1118,19 +1147,19 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, rot->cw = rot->ch = TILE_SIZE * state->n; rot->ox = rot->cx + rot->cw/2; rot->oy = rot->cy + rot->ch/2; - angle = (-PI/2 * lastr) * (1.0 - animtime / anim_max); - rot->c = cos(angle); - rot->s = sin(angle); + angle = (float)((-PI/2 * lastr) * (1.0 - animtime / anim_max)); + rot->c = (float)cos(angle); + rot->s = (float)sin(angle); /* * Sort out the colours of the various sides of the tile. */ - rot->lc = highlight_colour(PI + angle); + rot->lc = highlight_colour((float)PI + angle); rot->rc = highlight_colour(angle); - rot->tc = highlight_colour(PI/2 + angle); - rot->bc = highlight_colour(-PI/2 + angle); + rot->tc = highlight_colour((float)(PI/2.0) + angle); + rot->bc = highlight_colour((float)(-PI/2.0) + angle); - draw_rect(fe, rot->cx, rot->cy, rot->cw, rot->ch, bgcolour); + draw_rect(dr, rot->cx, rot->cy, rot->cw, rot->ch, bgcolour); } else rot = NULL; @@ -1138,7 +1167,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, * Now draw each tile. */ for (i = 0; i < state->w * state->h; i++) { - int t; + int t, cc = 0; int tx = i % state->w, ty = i / state->w; /* @@ -1155,15 +1184,31 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, else t = state->grid[i]; + if (cmoved) { + /* cursor has moved (or changed visibility)... */ + if (tx == cx || tx == cx+n-1 || ty == cy || ty == cy+n-1) + cc = 1; /* ...we're on new cursor, redraw */ + if (tx == ds->cur_x || tx == ds->cur_x+n-1 || + ty == ds->cur_y || ty == ds->cur_y+n-1) + cc = 1; /* ...we were on old cursor, redraw */ + } + if (ds->bgcolour != bgcolour || /* always redraw when flashing */ - ds->grid[i] != t || ds->grid[i] == -1 || t == -1) { + ds->grid[i] != t || ds->grid[i] == -1 || t == -1 || cc) { int x = COORD(tx), y = COORD(ty); + unsigned cedges = 0; - draw_tile(fe, ds, state, x, y, state->grid[i], bgcolour, rot); + if (tx == cx && ty >= cy && ty <= cy+n-1) cedges |= CUR_LEFT; + if (ty == cy && tx >= cx && tx <= cx+n-1) cedges |= CUR_TOP; + if (tx == cx+n-1 && ty >= cy && ty <= cy+n-1) cedges |= CUR_RIGHT; + if (ty == cy+n-1 && tx >= cx && tx <= cx+n-1) cedges |= CUR_BOTTOM; + + draw_tile(dr, ds, state, x, y, state->grid[i], bgcolour, rot, cedges); ds->grid[i] = t; } } ds->bgcolour = bgcolour; + ds->cur_x = cx; ds->cur_y = cy; /* * Update the status bar. @@ -1190,18 +1235,21 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, state->movetarget); } - status_bar(fe, statusbuf); + status_bar(dr, statusbuf); } } -static int game_wants_statusbar(void) +static int game_timing_state(game_state *state, game_ui *ui) { return TRUE; } -static int game_timing_state(game_state *state) +static void game_print_size(game_params *params, float *x, float *y) +{ +} + +static void game_print(drawing *dr, game_state *state, int tilesize) { - return TRUE; } #ifdef COMBINED @@ -1209,7 +1257,7 @@ static int game_timing_state(game_state *state) #endif const struct game thegame = { - "Twiddle", "games.twiddle", + "Twiddle", "games.twiddle", "twiddle", default_params, game_fetch_preset, decode_params, @@ -1224,7 +1272,7 @@ const struct game thegame = { dup_game, free_game, TRUE, solve_game, - TRUE, game_text_format, + TRUE, game_can_format_as_text_now, game_text_format, new_ui, free_ui, encode_ui, @@ -1232,14 +1280,17 @@ const struct game thegame = { 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, game_redraw, game_anim_length, game_flash_length, - game_wants_statusbar, + FALSE, FALSE, game_print_size, game_print, + TRUE, /* wants_statusbar */ FALSE, game_timing_state, - 0, /* mouse_priorities */ + 0, /* flags */ }; + +/* vim: set shiftwidth=4 tabstop=8: */