X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/f7c5453a997fc584264aeea3bbf4f47cdea93256..HEAD:/map.c?ds=sidebyside

diff --git a/map.c b/map.c
index bfff90a..af7c0af 100644
--- a/map.c
+++ b/map.c
@@ -100,8 +100,13 @@ static game_params *default_params(void)
 {
     game_params *ret = snew(game_params);
 
+#ifdef PORTRAIT_SCREEN
+    ret->w = 16;
+    ret->h = 18;
+#else
     ret->w = 20;
     ret->h = 15;
+#endif
     ret->n = 30;
     ret->diff = DIFF_NORMAL;
 
@@ -109,12 +114,21 @@ static game_params *default_params(void)
 }
 
 static const struct game_params map_presets[] = {
+#ifdef PORTRAIT_SCREEN
+    {16, 18, 30, DIFF_EASY},
+    {16, 18, 30, DIFF_NORMAL},
+    {16, 18, 30, DIFF_HARD},
+    {16, 18, 30, DIFF_RECURSE},
+    {25, 30, 75, DIFF_NORMAL},
+    {25, 30, 75, DIFF_HARD},
+#else
     {20, 15, 30, DIFF_EASY},
     {20, 15, 30, DIFF_NORMAL},
     {20, 15, 30, DIFF_HARD},
     {20, 15, 30, DIFF_RECURSE},
     {30, 25, 75, DIFF_NORMAL},
     {30, 25, 75, DIFF_HARD},
+#endif
 };
 
 static int game_fetch_preset(int i, char **name, game_params **params)
@@ -1359,6 +1373,7 @@ static int map_solver(struct solver_scratch *sc,
              */
         }
 
+        sfree(origcolouring);
         sfree(subcolouring);
         free_scratch(rsc);
 
@@ -1695,8 +1710,7 @@ static char *parse_edge_list(game_params *params, char **desc, int *map)
     int i, k, pos, state;
     char *p = *desc;
 
-    for (i = 0; i < wh; i++)
-	map[wh+i] = i;
+    dsf_init(map+wh, wh);
 
     pos = -1;
     state = 0;
@@ -1775,9 +1789,9 @@ static char *validate_desc(game_params *params, char *desc)
 
     map = snewn(2*wh, int);
     ret = parse_edge_list(params, &desc, map);
+    sfree(map);
     if (ret)
 	return ret;
-    sfree(map);
 
     if (*desc != ',')
 	return "Expected comma before clue list";
@@ -1868,7 +1882,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc)
      * outlines by the judicious use of diagonally divided squares.
      */
     {
-        random_state *rs = random_init(desc, strlen(desc));
+        random_state *rs = random_new(desc, strlen(desc));
         int *squares = snewn(wh, int);
         int done_something;
 
@@ -1937,7 +1951,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc)
 
 	for (i = 0; i < state->map->ngraph + n; i++) {
 	    bestx[i] = besty[i] = -1;
-	    best[i] = 2*(w+h)+1;
+	    best[i] = (float)(2*(w+h)+1);
 	    ax[i] = ay[i] = 0.0F;
 	    an[i] = 0;
 	}
@@ -2077,7 +2091,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc)
 			     */
 			    ax[gindex] += ex[i];
 			    ay[gindex] += ey[i];
-			    an[gindex] += 1.0F;
+			    an[gindex] += 1;
 			} else {
 			    /*
 			     * In pass 1, work out whether this
@@ -2089,7 +2103,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc)
 			    assert(an[gindex] > 0);
 			    dx = ex[i] - ax[gindex];
 			    dy = ey[i] - ay[gindex];
-			    d = sqrt(dx*dx + dy*dy);
+			    d = (float)sqrt(dx*dx + dy*dy);
 			    if (d < best[gindex]) {
 				best[gindex] = d;
 				bestx[gindex] = ex[i];
@@ -2169,6 +2183,7 @@ static void free_game(game_state *state)
 	sfree(state->map->regiony);
 	sfree(state->map);
     }
+    sfree(state->pencil);
     sfree(state->colouring);
     sfree(state);
 }
@@ -2233,16 +2248,31 @@ static char *solve_game(game_state *state, game_state *currstate,
     return dupstr(aux);
 }
 
+static int game_can_format_as_text_now(game_params *params)
+{
+    return TRUE;
+}
+
 static char *game_text_format(game_state *state)
 {
     return NULL;
 }
 
 struct game_ui {
-    int drag_colour;                   /* -1 means no drag active */
+    /*
+     * drag_colour:
+     * 
+     *  - -2 means no drag currently active.
+     *  - >=0 means we're dragging a solid colour.
+     * 	- -1 means we're dragging a blank space, and drag_pencil
+     * 	  might or might not add some pencil-mark stipples to that.
+     */
+    int drag_colour;
     int drag_pencil;
     int dragx, dragy;
     int show_numbers;
+
+    int cur_x, cur_y, cur_visible, cur_moved, cur_lastmove;
 };
 
 static game_ui *new_ui(game_state *state)
@@ -2250,7 +2280,10 @@ static game_ui *new_ui(game_state *state)
     game_ui *ui = snew(game_ui);
     ui->dragx = ui->dragy = -1;
     ui->drag_colour = -2;
+    ui->drag_pencil = 0;
     ui->show_numbers = FALSE;
+    ui->cur_x = ui->cur_y = ui->cur_visible = ui->cur_moved = 0;
+    ui->cur_lastmove = 0;
     return ui;
 }
 
@@ -2296,7 +2329,20 @@ struct game_drawstate {
 #define COORD(x)  ( (x) * TILESIZE + BORDER )
 #define FROMCOORD(x)  ( ((x) - BORDER + TILESIZE) / TILESIZE - 1 )
 
-static int region_from_coords(game_state *state, game_drawstate *ds,
+ /*
+  * EPSILON_FOO are epsilons added to absolute cursor position by
+  * cursor movement, such that in pathological cases (e.g. a very
+  * small diamond-shaped area) it's relatively easy to select the
+  * region you wanted.
+  */
+
+#define EPSILON_X(button) (((button) == CURSOR_RIGHT) ? +1 : \
+                           ((button) == CURSOR_LEFT)  ? -1 : 0)
+#define EPSILON_Y(button) (((button) == CURSOR_DOWN)  ? +1 : \
+                           ((button) == CURSOR_UP)    ? -1 : 0)
+
+
+static int region_from_coords(game_state *state, const game_drawstate *ds,
                               int x, int y)
 {
     int w = state->p.w, h = state->p.h, wh = w*h /*, n = state->p.n */;
@@ -2315,10 +2361,11 @@ static int region_from_coords(game_state *state, game_drawstate *ds,
     return state->map->map[quadrant * wh + ty*w+tx];
 }
 
-static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
+static char *interpret_move(game_state *state, game_ui *ui, const game_drawstate *ds,
 			    int x, int y, int button)
 {
     char *bufp, buf[256];
+    int alt_button;
 
     /*
      * Enable or disable numeric labels on regions.
@@ -2328,6 +2375,43 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
         return "";
     }
 
+    if (IS_CURSOR_MOVE(button)) {
+        move_cursor(button, &ui->cur_x, &ui->cur_y, state->p.w, state->p.h, 0);
+        ui->cur_visible = 1;
+        ui->cur_moved = 1;
+        ui->cur_lastmove = button;
+        ui->dragx = COORD(ui->cur_x) + TILESIZE/2 + EPSILON_X(button);
+        ui->dragy = COORD(ui->cur_y) + TILESIZE/2 + EPSILON_Y(button);
+        return "";
+    }
+    if (IS_CURSOR_SELECT(button)) {
+        if (!ui->cur_visible) {
+            ui->dragx = COORD(ui->cur_x) + TILESIZE/2 + EPSILON_X(ui->cur_lastmove);
+            ui->dragy = COORD(ui->cur_y) + TILESIZE/2 + EPSILON_Y(ui->cur_lastmove);
+            ui->cur_visible = 1;
+            return "";
+        }
+        if (ui->drag_colour == -2) { /* not currently cursor-dragging, start. */
+            int r = region_from_coords(state, ds, ui->dragx, ui->dragy);
+            if (r >= 0) {
+                ui->drag_colour = state->colouring[r];
+                ui->drag_pencil = (ui->drag_colour >= 0) ? 0 : state->pencil[r];
+            } else {
+                ui->drag_colour = -1;
+                ui->drag_pencil = 0;
+            }
+            ui->cur_moved = 0;
+            return "";
+        } else { /* currently cursor-dragging; drop the colour in the new region. */
+            x = COORD(ui->cur_x) + TILESIZE/2 + EPSILON_X(ui->cur_lastmove);
+            y = COORD(ui->cur_y) + TILESIZE/2 + EPSILON_Y(ui->cur_lastmove);
+            alt_button = (button == CURSOR_SELECT2) ? 1 : 0;
+            /* Double-select removes current colour. */
+            if (!ui->cur_moved) ui->drag_colour = -1;
+            goto drag_dropped;
+        }
+    }
+
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
 	int r = region_from_coords(state, ds, x, y);
 
@@ -2342,6 +2426,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
 	}
         ui->dragx = x;
         ui->dragy = y;
+        ui->cur_visible = 0;
         return "";
     }
 
@@ -2354,6 +2439,14 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
 
     if ((button == LEFT_RELEASE || button == RIGHT_RELEASE) &&
         ui->drag_colour > -2) {
+        alt_button = (button == RIGHT_RELEASE) ? 1 : 0;
+        goto drag_dropped;
+    }
+
+    return NULL;
+
+drag_dropped:
+    {
 	int r = region_from_coords(state, ds, x, y);
         int c = ui->drag_colour;
 	int p = ui->drag_pencil;
@@ -2363,7 +2456,6 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
          * Cancel the drag, whatever happens.
          */
         ui->drag_colour = -2;
-        ui->dragx = ui->dragy = -1;
 
 	if (r < 0)
             return "";                 /* drag into border; do nothing else */
@@ -2374,7 +2466,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
         if (state->colouring[r] == c && state->pencil[r] == p)
             return "";                 /* don't _need_ to change this region */
 
-	if (button == RIGHT_RELEASE) {
+	if (alt_button) {
 	    if (state->colouring[r] >= 0) {
 		/* Can't pencil on a coloured region */
 		return "";
@@ -2403,8 +2495,6 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
 
 	return dupstr(buf+1);	       /* ignore first semicolon */
     }
-
-    return NULL;
 }
 
 static game_state *execute_move(game_state *state, char *move)
@@ -2504,22 +2594,29 @@ static void game_set_size(drawing *dr, game_drawstate *ds,
 {
     ds->tilesize = tilesize;
 
-    if (ds->bl)
-        blitter_free(dr, ds->bl);
+    assert(!ds->bl);                   /* set_size is never called twice */
     ds->bl = blitter_new(dr, TILESIZE+3, TILESIZE+3);
 }
 
 const float map_colours[FOUR][3] = {
+#ifdef VIVID_COLOURS
+    /* Use more vivid colours (e.g. on the Pocket PC) */
+    {0.75F, 0.25F, 0.25F},
+    {0.3F,  0.7F,  0.3F},
+    {0.3F,  0.3F,  0.7F},
+    {0.85F, 0.85F, 0.1F},
+#else
     {0.7F, 0.5F, 0.4F},
     {0.8F, 0.7F, 0.4F},
     {0.5F, 0.6F, 0.4F},
     {0.55F, 0.45F, 0.35F},
+#endif
 };
 const int map_hatching[FOUR] = {
     HATCH_VERT, HATCH_SLASH, HATCH_HORIZ, HATCH_BACKSLASH
 };
 
-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);
 
@@ -2606,11 +2703,11 @@ static void draw_error(drawing *dr, game_drawstate *ds, int x, int y)
 
 static void draw_square(drawing *dr, game_drawstate *ds,
 			game_params *params, struct map *map,
-			int x, int y, int v)
+			int x, int y, unsigned long v)
 {
     int w = params->w, h = params->h, wh = w*h;
-    int tv, bv, xo, yo, errs, pencil, i, j, oldj;
-    int show_numbers;
+    int tv, bv, xo, yo, i, j, oldj;
+    unsigned long errs, pencil, show_numbers;
 
     errs = v & ERR_MASK;
     v &= ~ERR_MASK;
@@ -2679,7 +2776,7 @@ static void draw_square(drawing *dr, game_drawstate *ds,
 
 	    draw_circle(dr, COORD(x) + (xo+1)*TILESIZE/5,
 			COORD(y) + (yo+1)*TILESIZE/5,
-			TILESIZE/8, COL_0 + c, COL_0 + c);
+			TILESIZE/7, COL_0 + c, COL_0 + c);
 	}
 
     /*
@@ -2781,7 +2878,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
 	for (x = 0; x < w; x++) {
 	    int tv = state->colouring[state->map->map[TE * wh + y*w+x]];
 	    int bv = state->colouring[state->map->map[BE * wh + y*w+x]];
-            int v;
+            unsigned long v;
 
 	    if (tv < 0)
 		tv = FOUR;
@@ -2864,7 +2961,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
      */
     for (y = 0; y < h; y++)
 	for (x = 0; x < w; x++) {
-	    int v = ds->todraw[y*w+x];
+	    unsigned long v = ds->todraw[y*w+x];
 	    if (ds->drawn[y*w+x] != v) {
 		draw_square(dr, ds, &state->p, state->map, x, y, v);
 		ds->drawn[y*w+x] = v;
@@ -2874,13 +2971,26 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
     /*
      * Draw the dragged colour blob if any.
      */
-    if (ui->drag_colour > -2) {
+    if ((ui->drag_colour > -2) || ui->cur_visible) {
+        int bg, iscur = 0;
+        if (ui->drag_colour >= 0)
+            bg = COL_0 + ui->drag_colour;
+        else if (ui->drag_colour == -1) {
+            bg = COL_BACKGROUND;
+        } else {
+            int r = region_from_coords(state, ds, ui->dragx, ui->dragy);
+            int c = (r < 0) ? -1 : state->colouring[r];
+            assert(ui->cur_visible);
+            /*bg = COL_GRID;*/
+            bg = (c < 0) ? COL_BACKGROUND : COL_0 + c;
+            iscur = 1;
+        }
+
         ds->dragx = ui->dragx - TILESIZE/2 - 2;
         ds->dragy = ui->dragy - TILESIZE/2 - 2;
         blitter_save(dr, ds->bl, ds->dragx, ds->dragy);
-        draw_circle(dr, ui->dragx, ui->dragy, TILESIZE/2,
-                    (ui->drag_colour < 0 ? COL_BACKGROUND :
-                     COL_0 + ui->drag_colour), COL_GRID);
+        draw_circle(dr, ui->dragx, ui->dragy,
+                    iscur ? TILESIZE/4 : TILESIZE/2, bg, COL_GRID);
 	for (i = 0; i < FOUR; i++)
 	    if (ui->drag_pencil & (1 << i))
 		draw_circle(dr, ui->dragx + ((i*4+2)%10-3) * TILESIZE/10,
@@ -2908,16 +3018,16 @@ static float game_flash_length(game_state *oldstate, game_state *newstate,
 		flash_type = atoi(env);
 	    else
 		flash_type = 0;
-	    flash_length = (flash_type == 1 ? 0.50 : 0.30);
+	    flash_length = (flash_type == 1 ? 0.50F : 0.30F);
 	}
 	return flash_length;
     } else
 	return 0.0F;
 }
 
-static int game_wants_statusbar(void)
+static int game_status(game_state *state)
 {
-    return FALSE;
+    return state->completed ? +1 : 0;
 }
 
 static int game_timing_state(game_state *state, game_ui *ui)
@@ -2935,8 +3045,8 @@ static void game_print_size(game_params *params, float *x, float *y)
      * given tile size and then scale.
      */
     game_compute_size(params, 400, &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)
@@ -2948,12 +3058,14 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
+    /* We can't call game_set_size() here because we don't want a blitter */
     ads.tilesize = tilesize;
 
     ink = print_mono_colour(dr, 0);
     for (i = 0; i < FOUR; i++)
-	c[i] = print_rgb_colour(dr, map_hatching[i], map_colours[i][0],
-				map_colours[i][1], map_colours[i][2]);
+	c[i] = print_rgb_hatched_colour(dr, map_colours[i][0],
+					map_colours[i][1], map_colours[i][2],
+					map_hatching[i]);
 
     coordsize = 0;
     coords = NULL;
@@ -3081,7 +3193,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 #endif
 
 const struct game thegame = {
-    "Map", "games.map",
+    "Map", "games.map", "map",
     default_params,
     game_fetch_preset,
     decode_params,
@@ -3096,7 +3208,7 @@ const struct game thegame = {
     dup_game,
     free_game,
     TRUE, solve_game,
-    FALSE, game_text_format,
+    FALSE, game_can_format_as_text_now, game_text_format,
     new_ui,
     free_ui,
     encode_ui,
@@ -3111,53 +3223,15 @@ const struct game thegame = {
     game_redraw,
     game_anim_length,
     game_flash_length,
+    game_status,
     TRUE, TRUE, game_print_size, game_print,
-    game_wants_statusbar,
+    FALSE,			       /* wants_statusbar */
     FALSE, game_timing_state,
-    0,				       /* mouse_priorities */
+    0,				       /* flags */
 };
 
 #ifdef STANDALONE_SOLVER
 
-#include <stdarg.h>
-
-void frontend_default_colour(frontend *fe, float *output) {}
-void draw_text(drawing *dr, int x, int y, int fonttype, int fontsize,
-               int align, int colour, char *text) {}
-void draw_rect(drawing *dr, int x, int y, int w, int h, int colour) {}
-void draw_line(drawing *dr, int x1, int y1, int x2, int y2, int colour) {}
-void draw_polygon(drawing *dr, int *coords, int npoints,
-                  int fillcolour, int outlinecolour) {}
-void draw_circle(drawing *dr, int cx, int cy, int radius,
-                 int fillcolour, int outlinecolour) {}
-void clip(drawing *dr, int x, int y, int w, int h) {}
-void unclip(drawing *dr) {}
-void start_draw(drawing *dr) {}
-void draw_update(drawing *dr, int x, int y, int w, int h) {}
-void end_draw(drawing *dr) {}
-blitter *blitter_new(drawing *dr, int w, int h) {return NULL;}
-void blitter_free(drawing *dr, blitter *bl) {}
-void blitter_save(drawing *dr, blitter *bl, int x, int y) {}
-void blitter_load(drawing *dr, blitter *bl, int x, int y) {}
-int print_mono_colour(drawing *dr, int grey) { return 0; }
-int print_rgb_colour(drawing *dr, int hatch, float r, float g, float b)
-{ return 0; }
-void print_line_width(drawing *dr, int width) {}
-
-void fatal(char *fmt, ...)
-{
-    va_list ap;
-
-    fprintf(stderr, "fatal error: ");
-
-    va_start(ap, fmt);
-    vfprintf(stderr, fmt, ap);
-    va_end(ap);
-
-    fprintf(stderr, "\n");
-    exit(1);
-}
-
 int main(int argc, char **argv)
 {
     game_params *p;
@@ -3258,3 +3332,5 @@ int main(int argc, char **argv)
 }
 
 #endif
+
+/* vim: set shiftwidth=4 tabstop=8: */