X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=rect.c;h=55667c02a8372dd05ba30992c2643e0e247168f3;hb=3234912f921916a1b8da164fd61dc75579358577;hp=60c8e943df35a74d56fa59442bbe45617ee8bcb3;hpb=b7f192eea34e0bd36abcd457333ab37eb221789f;p=sgt-puzzles.git diff --git a/rect.c b/rect.c index 60c8e94..55667c0 100644 --- a/rect.c +++ b/rect.c @@ -36,7 +36,8 @@ enum { COL_LINE, COL_TEXT, COL_GRID, - COL_DRAG, + COL_DRAG, COL_DRAGERASE, + COL_CURSOR, NCOLOURS }; @@ -60,7 +61,11 @@ struct game_params { #define PREFERRED_TILE_SIZE 24 #define TILE_SIZE (ds->tilesize) +#ifdef SMALL_SCREEN +#define BORDER (2) +#else #define BORDER (TILE_SIZE * 3 / 4) +#endif #define CORNER_TOLERANCE 0.15F #define CENTRE_TOLERANCE 0.15F @@ -102,8 +107,10 @@ static int game_fetch_preset(int i, char **name, game_params **params) case 2: w = 11, h = 11; break; case 3: w = 13, h = 13; break; case 4: w = 15, h = 15; break; +#ifndef SMALL_SCREEN case 5: w = 17, h = 17; break; case 6: w = 19, h = 19; break; +#endif default: return FALSE; } @@ -122,7 +129,7 @@ static void free_params(game_params *params) sfree(params); } -static game_params *dup_params(game_params *params) +static game_params *dup_params(const game_params *params) { game_params *ret = snew(game_params); *ret = *params; /* structure copy */ @@ -140,7 +147,7 @@ static void decode_params(game_params *ret, char const *string) } if (*string == 'e') { string++; - ret->expandfactor = atof(string); + ret->expandfactor = (float)atof(string); while (*string && (*string == '.' || isdigit((unsigned char)*string))) string++; } @@ -150,7 +157,7 @@ static void decode_params(game_params *ret, char const *string) } } -static char *encode_params(game_params *params, int full) +static char *encode_params(const game_params *params, int full) { char data[256]; @@ -163,7 +170,7 @@ static char *encode_params(game_params *params, int full) return dupstr(data); } -static config_item *game_configure(game_params *params) +static config_item *game_configure(const game_params *params) { config_item *ret; char buf[80]; @@ -201,19 +208,19 @@ static config_item *game_configure(game_params *params) return ret; } -static game_params *custom_params(config_item *cfg) +static game_params *custom_params(const config_item *cfg) { game_params *ret = snew(game_params); ret->w = atoi(cfg[0].sval); ret->h = atoi(cfg[1].sval); - ret->expandfactor = atof(cfg[2].sval); + ret->expandfactor = (float)atof(cfg[2].sval); ret->unique = cfg[3].ival; return ret; } -static char *validate_params(game_params *params, int full) +static char *validate_params(const game_params *params, int full) { if (params->w <= 0 || params->h <= 0) return "Width and height must both be greater than zero"; @@ -323,6 +330,11 @@ static void remove_number_placement(int w, int h, struct numberdata *number, number->npoints--; } +/* + * Returns 0 for failure to solve due to inconsistency; 1 for + * success; 2 for failure to complete a solution due to either + * ambiguity or it being too difficult. + */ static int rect_solver(int w, int h, int nrects, struct numberdata *numbers, unsigned char *hedge, unsigned char *vedge, random_state *rs) @@ -428,6 +440,14 @@ static int rect_solver(int w, int h, int nrects, struct numberdata *numbers, * Indexing of this array is by the formula * * overlaps[(rectindex * h + y) * w + x] + * + * A positive or zero value indicates what it sounds as if it + * should; -1 indicates that this square _cannot_ be part of + * this rectangle; and -2 indicates that it _definitely_ is + * (which is distinct from 1, because one might very well know + * that _if_ square S is part of rectangle R then it must be + * because R is placed in a certain position without knowing + * that it definitely _is_). */ overlaps = snewn(nrects * w * h, int); memset(overlaps, 0, nrects * w * h * sizeof(int)); @@ -520,7 +540,10 @@ static int rect_solver(int w, int h, int nrects, struct numberdata *numbers, if (overlaps[(i * h + y) * w + x] >= -1) { int j; - assert(overlaps[(i * h + y) * w + x] > 0); + if (overlaps[(i * h + y) * w + x] <= 0) { + ret = 0; /* inconsistency */ + goto cleanup; + } #ifdef SOLVER_DIAGNOSTICS printf("marking %d,%d as known for rect %d" " (sole remaining number position)\n", x, y, i); @@ -562,7 +585,10 @@ static int rect_solver(int w, int h, int nrects, struct numberdata *numbers, for (yy = miny; yy < maxy; yy++) for (xx = minx; xx < maxx; xx++) if (overlaps[(i * h + yy) * w + xx] >= -1) { - assert(overlaps[(i * h + yy) * w + xx] > 0); + if (overlaps[(i * h + yy) * w + xx] <= 0) { + ret = 0; /* inconsistency */ + goto cleanup; + } #ifdef SOLVER_DIAGNOSTICS printf("marking %d,%d as known for rect %d" " (intersection of all placements)\n", @@ -841,15 +867,17 @@ static int rect_solver(int w, int h, int nrects, struct numberdata *numbers, } } - ret = TRUE; + cleanup: + ret = 1; for (i = 0; i < nrects; i++) { #ifdef SOLVER_DIAGNOSTICS printf("rect %d has %d possible placements\n", i, rectpositions[i].n); #endif - assert(rectpositions[i].n > 0); - if (rectpositions[i].n > 1) { - ret = FALSE; + if (rectpositions[i].n <= 0) { + ret = 0; /* inconsistency */ + } else if (rectpositions[i].n > 1) { + ret = 2; /* remaining uncertainty */ } else if (hedge && vedge) { /* * Place the rectangle in its only possible position. @@ -1118,9 +1146,11 @@ static void display_grid(game_params *params, int *grid, int *numbers, int all) } #endif -static char *new_game_desc(game_params *params, random_state *rs, +static char *new_game_desc(const game_params *params_in, random_state *rs, char **aux, int interactive) { + game_params params_copy = *params_in; /* structure copy */ + game_params *params = ¶ms_copy; int *grid, *numbers = NULL; int x, y, y2, y2last, yx, run, i, nsquares; char *desc, *p; @@ -1132,9 +1162,9 @@ static char *new_game_desc(game_params *params, random_state *rs, * Set up the smaller width and height which we will use to * generate the base grid. */ - params2->w = params->w / (1.0F + params->expandfactor); + params2->w = (int)((float)params->w / (1.0F + params->expandfactor)); if (params2->w < 2 && params->w >= 2) params2->w = 2; - params2->h = params->h / (1.0F + params->expandfactor); + params2->h = (int)((float)params->h / (1.0F + params->expandfactor)); if (params2->h < 2 && params->h >= 2) params2->h = 2; grid = snewn(params2->w * params2->h, int); @@ -1633,9 +1663,9 @@ static char *new_game_desc(game_params *params, random_state *rs, ret = rect_solver(params->w, params->h, nnumbers, nd, NULL, NULL, rs); else - ret = TRUE; /* allow any number placement at all */ + ret = 1; /* allow any number placement at all */ - if (ret) { + if (ret == 1) { /* * Now place the numbers according to the solver's * recommendations. @@ -1665,7 +1695,7 @@ static char *new_game_desc(game_params *params, random_state *rs, /* * If we've succeeded, then terminate the loop. */ - if (ret) + if (ret == 1) break; } @@ -1748,7 +1778,7 @@ static char *new_game_desc(game_params *params, random_state *rs, return desc; } -static char *validate_desc(game_params *params, char *desc) +static char *validate_desc(const game_params *params, const char *desc) { int area = params->w * params->h; int squares = 0; @@ -1869,7 +1899,8 @@ static unsigned char *get_correct(game_state *state) return ret; } -static game_state *new_game(midend *me, game_params *params, char *desc) +static game_state *new_game(midend *me, const game_params *params, + const char *desc) { game_state *state = snew(game_state); int x, y, i, area; @@ -1914,7 +1945,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc) return state; } -static game_state *dup_game(game_state *state) +static game_state *dup_game(const game_state *state) { game_state *ret = snew(game_state); @@ -1947,8 +1978,8 @@ static void free_game(game_state *state) sfree(state); } -static char *solve_game(game_state *state, game_state *currstate, - char *ai, char **error) +static char *solve_game(const game_state *state, const game_state *currstate, + const char *ai, char **error) { unsigned char *vedge, *hedge; int x, y, len; @@ -2016,7 +2047,12 @@ static char *solve_game(game_state *state, game_state *currstate, return ret; } -static char *game_text_format(game_state *state) +static int game_can_format_as_text_now(const game_params *params) +{ + return TRUE; +} + +static char *game_text_format(const game_state *state) { char *ret, *p, buf[80]; int i, x, y, col, maxlen; @@ -2131,6 +2167,11 @@ struct game_ui { * treated as a small drag rather than a click. */ int dragged; + /* This flag is set if we're doing an erase operation (i.e. + * removing edges in the centre of the rectangle without altering + * the outlines). + */ + int erasing; /* * These are the co-ordinates of the top-left and bottom-right squares * in the drag box, respectively, or -1 otherwise. @@ -2139,20 +2180,32 @@ struct game_ui { int y1; int x2; int y2; + /* + * These are the coordinates of a cursor, whether it's visible, and + * whether it was used to start a drag. + */ + int cur_x, cur_y, cur_visible, cur_dragging; }; -static game_ui *new_ui(game_state *state) +static void reset_ui(game_ui *ui) { - game_ui *ui = snew(game_ui); ui->drag_start_x = -1; ui->drag_start_y = -1; ui->drag_end_x = -1; ui->drag_end_y = -1; - ui->dragged = FALSE; ui->x1 = -1; ui->y1 = -1; ui->x2 = -1; ui->y2 = -1; + ui->dragged = FALSE; +} + +static game_ui *new_ui(const game_state *state) +{ + game_ui *ui = snew(game_ui); + reset_ui(ui); + ui->erasing = FALSE; + ui->cur_x = ui->cur_y = ui->cur_visible = ui->cur_dragging = 0; return ui; } @@ -2161,12 +2214,12 @@ static void free_ui(game_ui *ui) sfree(ui); } -static char *encode_ui(game_ui *ui) +static char *encode_ui(const game_ui *ui) { return NULL; } -static void decode_ui(game_ui *ui, char *encoding) +static void decode_ui(game_ui *ui, const char *encoding) { } @@ -2257,9 +2310,9 @@ static void coord_round(float x, float y, int *xr, int *yr) /* * Returns TRUE if it has made any change to the grid. */ -static int grid_draw_rect(game_state *state, +static int grid_draw_rect(const game_state *state, unsigned char *hedge, unsigned char *vedge, - int c, int really, + int c, int really, int outline, int x1, int y1, int x2, int y2) { int x, y; @@ -2272,9 +2325,10 @@ static int grid_draw_rect(game_state *state, for (y = y1; y <= y2; y++) if (HRANGE(state,x,y)) { int val = index(state,hedge,x,y); - if (y == y1 || y == y2) + if (y == y1 || y == y2) { + if (!outline) continue; val = c; - else if (c == 1) + } else if (c == 1) val = 0; changed = changed || (index(state,hedge,x,y) != val); if (really) @@ -2288,9 +2342,10 @@ static int grid_draw_rect(game_state *state, for (x = x1; x <= x2; x++) if (VRANGE(state,x,y)) { int val = index(state,vedge,x,y); - if (x == x1 || x == x2) + if (x == x1 || x == x2) { + if (!outline) continue; val = c; - else if (c == 1) + } else if (c == 1) val = 0; changed = changed || (index(state,vedge,x,y) != val); if (really) @@ -2300,16 +2355,16 @@ static int grid_draw_rect(game_state *state, return changed; } -static int ui_draw_rect(game_state *state, game_ui *ui, +static int ui_draw_rect(const game_state *state, const game_ui *ui, unsigned char *hedge, unsigned char *vedge, int c, - int really) + int really, int outline) { - return grid_draw_rect(state, hedge, vedge, c, really, + return grid_draw_rect(state, hedge, vedge, c, really, outline, ui->x1, ui->y1, ui->x2, ui->y2); } -static void game_changed_state(game_ui *ui, game_state *oldstate, - game_state *newstate) +static void game_changed_state(game_ui *ui, const game_state *oldstate, + const game_state *newstate) { } @@ -2319,34 +2374,87 @@ struct game_drawstate { unsigned long *visible; }; -static char *interpret_move(game_state *from, game_ui *ui, game_drawstate *ds, - int x, int y, int button) +static char *interpret_move(const game_state *from, game_ui *ui, + const game_drawstate *ds, + int x, int y, int button) { int xc, yc; - int startdrag = FALSE, enddrag = FALSE, active = FALSE; + int startdrag = FALSE, enddrag = FALSE, active = FALSE, erasing = FALSE; char buf[80], *ret; button &= ~MOD_MASK; - if (button == LEFT_BUTTON) { + coord_round(FROMCOORD((float)x), FROMCOORD((float)y), &xc, &yc); + + if (button == LEFT_BUTTON || button == RIGHT_BUTTON) { + if (ui->drag_start_x >= 0 && ui->cur_dragging) + reset_ui(ui); /* cancel keyboard dragging */ startdrag = TRUE; - } else if (button == LEFT_RELEASE) { + ui->cur_visible = ui->cur_dragging = FALSE; + active = TRUE; + erasing = (button == RIGHT_BUTTON); + } else if (button == LEFT_RELEASE || button == RIGHT_RELEASE) { + /* We assert we should have had a LEFT_BUTTON first. */ + if (ui->cur_visible) { + ui->cur_visible = FALSE; + active = TRUE; + } + assert(!ui->cur_dragging); enddrag = TRUE; - } else if (button != LEFT_DRAG) { + erasing = (button == RIGHT_RELEASE); + } else if (IS_CURSOR_MOVE(button)) { + move_cursor(button, &ui->cur_x, &ui->cur_y, from->w, from->h, 0); + ui->cur_visible = TRUE; + active = TRUE; + if (!ui->cur_dragging) return ""; + coord_round((float)ui->cur_x + 0.5F, (float)ui->cur_y + 0.5F, &xc, &yc); + } else if (IS_CURSOR_SELECT(button)) { + if (ui->drag_start_x >= 0 && !ui->cur_dragging) { + /* + * If a mouse drag is in progress, ignore attempts to + * start a keyboard one. + */ + return NULL; + } + if (!ui->cur_visible) { + assert(!ui->cur_dragging); + ui->cur_visible = TRUE; + return ""; + } + coord_round((float)ui->cur_x + 0.5F, (float)ui->cur_y + 0.5F, &xc, &yc); + erasing = (button == CURSOR_SELECT2); + if (ui->cur_dragging) { + ui->cur_dragging = FALSE; + enddrag = TRUE; + active = TRUE; + } else { + ui->cur_dragging = TRUE; + startdrag = TRUE; + active = TRUE; + } + } else if (button == '\b' || button == 27) { + if (!ui->cur_dragging) { + ui->cur_visible = FALSE; + } else { + assert(ui->cur_visible); + reset_ui(ui); /* cancel keyboard dragging */ + ui->cur_dragging = FALSE; + } + return ""; + } else if (button != LEFT_DRAG && button != RIGHT_DRAG) { return NULL; } - coord_round(FROMCOORD((float)x), FROMCOORD((float)y), &xc, &yc); - if (startdrag && xc >= 0 && xc <= 2*from->w && yc >= 0 && yc <= 2*from->h) { ui->drag_start_x = xc; ui->drag_start_y = yc; - ui->drag_end_x = xc; - ui->drag_end_y = yc; + ui->drag_end_x = -1; + ui->drag_end_y = -1; ui->dragged = FALSE; + ui->erasing = erasing; active = TRUE; } @@ -2354,9 +2462,10 @@ static char *interpret_move(game_state *from, game_ui *ui, game_drawstate *ds, (xc != ui->drag_end_x || yc != ui->drag_end_y)) { int t; + if (ui->drag_end_x != -1 && ui->drag_end_y != -1) + ui->dragged = TRUE; ui->drag_end_x = xc; ui->drag_end_y = yc; - ui->dragged = TRUE; active = TRUE; if (xc >= 0 && xc <= 2*from->w && @@ -2385,12 +2494,14 @@ static char *interpret_move(game_state *from, game_ui *ui, game_drawstate *ds, if (enddrag && (ui->drag_start_x >= 0)) { if (xc >= 0 && xc <= 2*from->w && - yc >= 0 && yc <= 2*from->h) { + yc >= 0 && yc <= 2*from->h && + erasing == ui->erasing) { if (ui->dragged) { if (ui_draw_rect(from, ui, from->hedge, - from->vedge, 1, FALSE)) { - sprintf(buf, "R%d,%d,%d,%d", + from->vedge, 1, FALSE, !ui->erasing)) { + sprintf(buf, "%c%d,%d,%d,%d", + (int)(ui->erasing ? 'E' : 'R'), ui->x1, ui->y1, ui->x2 - ui->x1, ui->y2 - ui->y1); ret = dupstr(buf); } @@ -2406,15 +2517,7 @@ static char *interpret_move(game_state *from, game_ui *ui, game_drawstate *ds, } } - ui->drag_start_x = -1; - ui->drag_start_y = -1; - ui->drag_end_x = -1; - ui->drag_end_y = -1; - ui->x1 = -1; - ui->y1 = -1; - ui->x2 = -1; - ui->y2 = -1; - ui->dragged = FALSE; + reset_ui(ui); active = TRUE; } @@ -2426,13 +2529,13 @@ static char *interpret_move(game_state *from, game_ui *ui, game_drawstate *ds, return NULL; } -static game_state *execute_move(game_state *from, char *move) +static game_state *execute_move(const game_state *from, const char *move) { game_state *ret; int x1, y1, x2, y2, mode; if (move[0] == 'S') { - char *p = move+1; + const char *p = move+1; int x, y; ret = dup_game(from); @@ -2454,7 +2557,7 @@ static game_state *execute_move(game_state *from, char *move) return ret; - } else if (move[0] == 'R' && + } else if ((move[0] == 'R' || move[0] == 'E') && sscanf(move+1, "%d,%d,%d,%d", &x1, &y1, &x2, &y2) == 4 && x1 >= 0 && x2 >= 0 && x1+x2 <= from->w && y1 >= 0 && y2 >= 0 && y1+y2 <= from->h) { @@ -2471,8 +2574,9 @@ static game_state *execute_move(game_state *from, char *move) ret = dup_game(from); - if (mode == 'R') { - grid_draw_rect(ret, ret->hedge, ret->vedge, 1, TRUE, x1, y1, x2, y2); + if (mode == 'R' || mode == 'E') { + grid_draw_rect(ret, ret->hedge, ret->vedge, 1, TRUE, + mode == 'R', x1, y1, x2, y2); } else if (mode == 'H') { hedge(ret,x1,y1) = !hedge(ret,x1,y1); } else if (mode == 'V') { @@ -2507,12 +2611,13 @@ static game_state *execute_move(game_state *from, char *move) */ #define CORRECT (1L<<16) +#define CURSOR (1L<<17) -#define COLOUR(k) ( (k)==1 ? COL_LINE : COL_DRAG ) +#define COLOUR(k) ( (k)==1 ? COL_LINE : (k)==2 ? COL_DRAG : COL_DRAGERASE ) #define MAX4(x,y,z,w) ( max(max(x,y),max(z,w)) ) -static void game_compute_size(game_params *params, int tilesize, - int *x, int *y) +static void game_compute_size(const game_params *params, int tilesize, + int *x, int *y) { /* Ick: fake up `ds->tilesize' for macro expansion purposes */ struct { int tilesize; } ads, *ds = &ads; @@ -2523,12 +2628,12 @@ static void game_compute_size(game_params *params, int tilesize, } static void game_set_size(drawing *dr, game_drawstate *ds, - game_params *params, int tilesize) + const game_params *params, int tilesize) { ds->tilesize = tilesize; } -static float *game_colours(frontend *fe, game_state *state, int *ncolours) +static float *game_colours(frontend *fe, int *ncolours) { float *ret = snewn(3 * NCOLOURS, float); @@ -2542,6 +2647,10 @@ static float *game_colours(frontend *fe, game_state *state, int *ncolours) ret[COL_DRAG * 3 + 1] = 0.0F; ret[COL_DRAG * 3 + 2] = 0.0F; + ret[COL_DRAGERASE * 3 + 0] = 0.2F; + ret[COL_DRAGERASE * 3 + 1] = 0.2F; + ret[COL_DRAGERASE * 3 + 2] = 1.0F; + ret[COL_CORRECT * 3 + 0] = 0.75F * ret[COL_BACKGROUND * 3 + 0]; ret[COL_CORRECT * 3 + 1] = 0.75F * ret[COL_BACKGROUND * 3 + 1]; ret[COL_CORRECT * 3 + 2] = 0.75F * ret[COL_BACKGROUND * 3 + 2]; @@ -2554,11 +2663,15 @@ static float *game_colours(frontend *fe, game_state *state, int *ncolours) ret[COL_TEXT * 3 + 1] = 0.0F; ret[COL_TEXT * 3 + 2] = 0.0F; + ret[COL_CURSOR * 3 + 0] = 1.0F; + ret[COL_CURSOR * 3 + 1] = 0.5F; + ret[COL_CURSOR * 3 + 2] = 0.5F; + *ncolours = NCOLOURS; return ret; } -static game_drawstate *game_new_drawstate(drawing *dr, game_state *state) +static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state) { struct game_drawstate *ds = snew(struct game_drawstate); int i; @@ -2580,16 +2693,17 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds) sfree(ds); } -static void draw_tile(drawing *dr, game_drawstate *ds, game_state *state, +static void draw_tile(drawing *dr, game_drawstate *ds, const game_state *state, int x, int y, unsigned char *hedge, unsigned char *vedge, - unsigned char *corners, int correct) + unsigned char *corners, unsigned long bgflags) { int cx = COORD(x), cy = COORD(y); char str[80]; draw_rect(dr, cx, cy, TILE_SIZE+1, TILE_SIZE+1, COL_GRID); draw_rect(dr, cx+1, cy+1, TILE_SIZE-1, TILE_SIZE-1, - correct ? COL_CORRECT : COL_BACKGROUND); + (bgflags & CURSOR) ? COL_CURSOR : + (bgflags & CORRECT) ? COL_CORRECT : COL_BACKGROUND); if (grid(state,x,y)) { sprintf(str, "%d", grid(state,x,y)); @@ -2636,9 +2750,10 @@ static void draw_tile(drawing *dr, game_drawstate *ds, game_state *state, draw_update(dr, cx, cy, TILE_SIZE+1, TILE_SIZE+1); } -static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, - game_state *state, int dir, game_ui *ui, - float animtime, float flashtime) +static void game_redraw(drawing *dr, game_drawstate *ds, + const game_state *oldstate, const game_state *state, + int dir, const game_ui *ui, + float animtime, float flashtime) { int x, y; unsigned char *hedge, *vedge, *corners; @@ -2648,7 +2763,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, vedge = snewn(state->w*state->h, unsigned char); memcpy(hedge, state->hedge, state->w*state->h); memcpy(vedge, state->vedge, state->w*state->h); - ui_draw_rect(state, ui, hedge, vedge, 2, TRUE); + ui_draw_rect(state, ui, hedge, vedge, ui->erasing ? 3 : 2, TRUE, TRUE); } else { hedge = state->hedge; vedge = state->vedge; @@ -2710,10 +2825,12 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, c |= (unsigned long)index(state,corners,x+1,y+1) << 14; if (index(state, state->correct, x, y) && !flashtime) c |= CORRECT; + if (ui->cur_visible && ui->cur_x == x && ui->cur_y == y) + c |= CURSOR; if (index(ds,ds->visible,x,y) != c) { draw_tile(dr, ds, state, x, y, hedge, vedge, corners, - (c & CORRECT) ? 1 : 0); + (c & (CORRECT|CURSOR)) ); index(ds,ds->visible,x,y) = c; } } @@ -2721,7 +2838,8 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, { char buf[256]; - if (ui->x1 >= 0 && ui->y1 >= 0 && + if (ui->dragged && + ui->x1 >= 0 && ui->y1 >= 0 && ui->x2 >= 0 && ui->y2 >= 0) { sprintf(buf, "%dx%d ", ui->x2-ui->x1, @@ -2746,14 +2864,14 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, sfree(corners); } -static float game_anim_length(game_state *oldstate, - game_state *newstate, int dir, game_ui *ui) +static float game_anim_length(const game_state *oldstate, + const game_state *newstate, int dir, game_ui *ui) { return 0.0F; } -static float game_flash_length(game_state *oldstate, - game_state *newstate, int dir, game_ui *ui) +static float game_flash_length(const game_state *oldstate, + const game_state *newstate, int dir, game_ui *ui) { if (!oldstate->completed && newstate->completed && !oldstate->cheated && !newstate->cheated) @@ -2761,17 +2879,17 @@ static float game_flash_length(game_state *oldstate, return 0.0F; } -static int game_wants_statusbar(void) +static int game_status(const game_state *state) { - return TRUE; + return state->completed ? +1 : 0; } -static int game_timing_state(game_state *state, game_ui *ui) +static int game_timing_state(const game_state *state, game_ui *ui) { return TRUE; } -static void game_print_size(game_params *params, float *x, float *y) +static void game_print_size(const game_params *params, float *x, float *y) { int pw, ph; @@ -2779,11 +2897,11 @@ static void game_print_size(game_params *params, float *x, float *y) * I'll use 5mm squares by default. */ game_compute_size(params, 500, &pw, &ph); - *x = pw / 100.0; - *y = ph / 100.0; + *x = pw / 100.0F; + *y = ph / 100.0F; } -static void game_print(drawing *dr, game_state *state, int tilesize) +static void game_print(drawing *dr, const game_state *state, int tilesize) { int w = state->w, h = state->h; int ink = print_mono_colour(dr, 0); @@ -2841,7 +2959,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize) #endif const struct game thegame = { - "Rectangles", "games.rectangles", + "Rectangles", "games.rectangles", "rectangles", default_params, game_fetch_preset, decode_params, @@ -2856,7 +2974,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, @@ -2871,8 +2989,11 @@ const struct game thegame = { game_redraw, game_anim_length, game_flash_length, + game_status, TRUE, FALSE, game_print_size, game_print, - game_wants_statusbar, + TRUE, /* wants_statusbar */ FALSE, game_timing_state, 0, /* flags */ }; + +/* vim: set shiftwidth=4 tabstop=8: */