Introduce a front-end function to draw circles.

[sgt-puzzles.git] / puzzles.h

diff --git a/puzzles.h b/puzzles.h
index 8be90095fc19fb3b72ca2b47920200c30af53f69..ed1fef6896230ef54e5051df21cc8f1fccd3273c 100644 (file)
--- a/puzzles.h
+++ b/puzzles.h
@@ -22,8 +22,12 @@
 #define STR(x) STR_INT(x)
 
 /* NB not perfect because they evaluate arguments multiple times. */
+#ifndef max
 #define max(x,y) ( (x)>(y) ? (x) : (y) )
+#endif /* max */
+#ifndef min
 #define min(x,y) ( (x)<(y) ? (x) : (y) )
+#endif /* min */
 
 enum {
     LEFT_BUTTON = 0x0200,
@@ -39,6 +43,7 @@ enum {
     CURSOR_DOWN,
     CURSOR_LEFT,
     CURSOR_RIGHT,
+    CURSOR_SELECT,
     
     /* made smaller because of 'limited range of datatype' errors. */
     MOD_CTRL       = 0x1000,
@@ -69,6 +74,7 @@ typedef struct game_aux_info game_aux_info;
 typedef struct game_ui game_ui;
 typedef struct game_drawstate game_drawstate;
 typedef struct game game;
+typedef struct blitter blitter;
 
 #define ALIGN_VNORMAL 0x000
 #define ALIGN_VCENTRE 0x100
@@ -131,6 +137,8 @@ void draw_rect(frontend *fe, int x, int y, int w, int h, int colour);
 void draw_line(frontend *fe, int x1, int y1, int x2, int y2, int colour);
 void draw_polygon(frontend *fe, int *coords, int npoints,
                   int fill, int colour);
+void draw_circle(frontend *fe, int cx, int cy, int radius,
+                 int fill, int colour);
 void clip(frontend *fe, int x, int y, int w, int h);
 void unclip(frontend *fe);
 void start_draw(frontend *fe);
@@ -141,13 +149,23 @@ void activate_timer(frontend *fe);
 void status_bar(frontend *fe, char *text);
 void get_random_seed(void **randseed, int *randseedsize);
 
+blitter *blitter_new(int w, int h);
+void blitter_free(blitter *bl);
+/* save puts the portion of the current display with top-left corner
+ * (x,y) to the blitter. load puts it back again to the specified
+ * coords, or else wherever it was saved from
+ * (if x = y = BLITTER_FROMSAVED). */
+void blitter_save(frontend *fe, blitter *bl, int x, int y);
+#define BLITTER_FROMSAVED (-1)
+void blitter_load(frontend *fe, blitter *bl, int x, int y);
+
 /*
  * midend.c
  */
 midend_data *midend_new(frontend *fe, const game *ourgame);
 void midend_free(midend_data *me);
 void midend_set_params(midend_data *me, game_params *params);
-void midend_size(midend_data *me, int *x, int *y);
+void midend_size(midend_data *me, int *x, int *y, int expand);
 void midend_new_game(midend_data *me);
 void midend_restart_game(midend_data *me);
 void midend_stop_anim(midend_data *me);
@@ -243,14 +261,18 @@ struct game {
     game_state *(*dup_game)(game_state *state);
     void (*free_game)(game_state *state);
     int can_solve;
-    game_state *(*solve)(game_state *state, game_aux_info *aux, char **error);
+    game_state *(*solve)(game_state *orig, game_state *curr,
+                        game_aux_info *aux, char **error);
     int can_format_as_text;
     char *(*text_format)(game_state *state);
     game_ui *(*new_ui)(game_state *state);
     void (*free_ui)(game_ui *ui);
+    void (*changed_state)(game_ui *ui, game_state *oldstate,
+                          game_state *newstate);
     game_state *(*make_move)(game_state *from, game_ui *ui, game_drawstate *ds,
                              int x, int y, int button);
-    void (*size)(game_params *params, int *x, int *y);
+    void (*size)(game_params *params, game_drawstate *ds, int *x, int *y,
+                 int expand);
     float *(*colours)(frontend *fe, game_state *state, int *ncolours);
     game_drawstate *(*new_drawstate)(game_state *state);
     void (*free_drawstate)(game_drawstate *ds);