Implemented text and clipping primitives in the frontend, and added

[sgt/puzzles] / puzzles.h

diff --git a/puzzles.h b/puzzles.h
index 86c2cc1..cb276e2 100644 (file)
--- a/puzzles.h
+++ b/puzzles.h
@@ -21,7 +21,11 @@ enum {
     CURSOR_UP,
     CURSOR_DOWN,
     CURSOR_LEFT,
-    CURSOR_RIGHT
+    CURSOR_RIGHT,
+    CURSOR_UP_LEFT,
+    CURSOR_DOWN_LEFT,
+    CURSOR_UP_RIGHT,
+    CURSOR_DOWN_RIGHT
 };
 
 #define IGNOREARG(x) ( (x) = (x) )
@@ -33,15 +37,29 @@ typedef struct game_params game_params;
 typedef struct game_state game_state;
 typedef struct game_drawstate game_drawstate;
 
+#define ALIGN_VNORMAL 0x000
+#define ALIGN_VCENTRE 0x100
+
+#define ALIGN_HLEFT   0x000
+#define ALIGN_HCENTRE 0x001
+#define ALIGN_HRIGHT  0x002
+
+#define FONT_FIXED    0
+#define FONT_VARIABLE 1
+
 /*
  * Platform routines
  */
 void fatal(char *fmt, ...);
 void frontend_default_colour(frontend *fe, float *output);
+void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize,
+               int align, int colour, char *text);
 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 clip(frontend *fe, int x, int y, int w, int h);
+void unclip(frontend *fe);
 void start_draw(frontend *fe);
 void draw_update(frontend *fe, int x, int y, int w, int h);
 void end_draw(frontend *fe);
@@ -80,6 +98,11 @@ char *dupstr(char *s);
     ( (type *) srealloc ((array), (number) * sizeof (type)) )
 
 /*
+ * misc.c
+ */
+int rand_upto(int limit);
+
+/*
  * random.c
  */
 random_state *random_init(char *seed, int len);
@@ -89,6 +112,7 @@ void random_free(random_state *state);
 /*
  * Game-specific routines
  */
+extern const char *const game_name;
 game_params *default_params(void);
 int game_fetch_preset(int i, char **name, game_params **params);
 void free_params(game_params *params);
@@ -103,7 +127,8 @@ float *game_colours(frontend *fe, game_state *state, int *ncolours);
 game_drawstate *game_new_drawstate(game_state *state);
 void game_free_drawstate(game_drawstate *ds);
 void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
-                 game_state *newstate, float t);
+                 game_state *newstate, float anim_time, float flash_time);
 float game_anim_length(game_state *oldstate, game_state *newstate);
+float game_flash_length(game_state *oldstate, game_state *newstate);
 
 #endif /* PUZZLES_PUZZLES_H */