Implemented text and clipping primitives in the frontend, and added

[sgt/puzzles] / midend.c

diff --git a/midend.c b/midend.c
index edde2e8..3b1a0e4 100644 (file)
--- a/midend.c
+++ b/midend.c
@@ -14,11 +14,17 @@ struct midend_data {
     frontend *frontend;
     char *seed;
     int nstates, statesize, statepos;
+
+    game_params **presets;
+    char **preset_names;
+    int npresets, presetsize;
+
     game_params *params;
     game_state **states;
     game_drawstate *drawstate;
     game_state *oldstate;
     float anim_time, anim_pos;
+    float flash_time, flash_pos;
 };
 
 #define ensure(me) do { \
@@ -39,6 +45,11 @@ midend_data *midend_new(frontend *frontend)
     me->seed = NULL;
     me->drawstate = NULL;
     me->oldstate = NULL;
+    me->presets = NULL;
+    me->preset_names = NULL;
+    me->npresets = me->presetsize = 0;
+    me->anim_time = me->anim_pos = 0.0F;
+    me->flash_time = me->flash_pos = 0.0F;
 
     return me;
 }
@@ -59,7 +70,7 @@ void midend_size(midend_data *me, int *x, int *y)
 void midend_set_params(midend_data *me, game_params *params)
 {
     free_params(me->params);
-    me->params = params;
+    me->params = dup_params(params);
 }
 
 void midend_new_game(midend_data *me, char *seed)
@@ -91,16 +102,47 @@ void midend_restart_game(midend_data *me)
     me->statepos = me->nstates;
 }
 
-void midend_undo(midend_data *me)
+static int midend_undo(midend_data *me)
 {
-    if (me->statepos > 1)
+    if (me->statepos > 1) {
        me->statepos--;
+        return 1;
+    } else
+        return 0;
 }
 
-void midend_redo(midend_data *me)
+static int midend_redo(midend_data *me)
 {
-    if (me->statepos < me->nstates)
+    if (me->statepos < me->nstates) {
        me->statepos++;
+        return 1;
+    } else
+        return 0;
+}
+
+static void midend_finish_move(midend_data *me)
+{
+    float flashtime;
+
+    if (me->oldstate || me->statepos > 1) {
+       flashtime = game_flash_length(me->oldstate ? me->oldstate :
+                                     me->states[me->statepos-2],
+                                     me->states[me->statepos-1]);
+       if (flashtime > 0) {
+           me->flash_pos = 0.0F;
+           me->flash_time = flashtime;
+       }
+    }
+
+    if (me->oldstate)
+       free_game(me->oldstate);
+    me->oldstate = NULL;
+    me->anim_pos = me->anim_time = 0;
+
+    if (me->flash_time == 0 && me->anim_time == 0)
+       deactivate_timer(me->frontend);
+    else
+       activate_timer(me->frontend);
 }
 
 int midend_process_key(midend_data *me, int x, int y, int button)
@@ -109,11 +151,7 @@ int midend_process_key(midend_data *me, int x, int y, int button)
     float anim_time;
 
     if (me->oldstate || me->anim_time) {
-        if (me->oldstate)
-            free_game(me->oldstate);
-        me->oldstate = NULL;
-        me->anim_pos = me->anim_time = 0;
-        deactivate_timer(me->frontend);
+       midend_finish_move(me);
         midend_redraw(me);
     }
 
@@ -126,10 +164,12 @@ int midend_process_key(midend_data *me, int x, int y, int button)
         midend_redraw(me);
         return 1;                      /* never animate */
     } else if (button == 'u' || button == 'u' ||
-              button == '\x1A' || button == '\x1F') {
-       midend_undo(me);
+               button == '\x1A' || button == '\x1F') {
+       if (!midend_undo(me))
+            return 1;
     } else if (button == '\x12') {
-       midend_redo(me);
+       if (!midend_redo(me))
+            return 1;
     } else if (button == 'q' || button == 'Q' || button == '\x11') {
        free_game(oldstate);
         return 0;
@@ -153,13 +193,12 @@ int midend_process_key(midend_data *me, int x, int y, int button)
      */
     anim_time = game_anim_length(oldstate, me->states[me->statepos-1]);
 
+    me->oldstate = oldstate;
     if (anim_time > 0) {
-        me->oldstate = oldstate;
         me->anim_time = anim_time;
     } else {
-        free_game(oldstate);
-        me->oldstate = NULL;
         me->anim_time = 0.0;
+       midend_finish_move(me);
     }
     me->anim_pos = 0.0;
 
@@ -177,10 +216,11 @@ void midend_redraw(midend_data *me)
         if (me->oldstate && me->anim_time > 0 &&
             me->anim_pos < me->anim_time) {
             game_redraw(me->frontend, me->drawstate, me->oldstate,
-                        me->states[me->statepos-1], me->anim_pos);
+                        me->states[me->statepos-1], me->anim_pos,
+                       me->flash_pos);
         } else {
             game_redraw(me->frontend, me->drawstate, NULL,
-                        me->states[me->statepos-1], 0.0);
+                        me->states[me->statepos-1], 0.0, me->flash_pos);
         }
         end_draw(me->frontend);
     }
@@ -191,12 +231,15 @@ void midend_timer(midend_data *me, float tplus)
     me->anim_pos += tplus;
     if (me->anim_pos >= me->anim_time ||
         me->anim_time == 0 || !me->oldstate) {
-        if (me->oldstate)
-            free_game(me->oldstate);
-        me->oldstate = NULL;
-        me->anim_pos = me->anim_time = 0;
-        deactivate_timer(me->frontend);
+       if (me->anim_time > 0)
+           midend_finish_move(me);
+    }
+    me->flash_pos += tplus;
+    if (me->flash_pos >= me->flash_time || me->flash_time == 0) {
+       me->flash_pos = me->flash_time = 0;
     }
+    if (me->flash_time == 0 && me->anim_time == 0)
+       deactivate_timer(me->frontend);
     midend_redraw(me);
 }
 
@@ -219,3 +262,35 @@ float *midend_colours(midend_data *me, int *ncolours)
 
     return ret;
 }
+
+int midend_num_presets(midend_data *me)
+{
+    if (!me->npresets) {
+        char *name;
+        game_params *preset;
+
+        while (game_fetch_preset(me->npresets, &name, &preset)) {
+            if (me->presetsize <= me->npresets) {
+                me->presetsize = me->npresets + 10;
+                me->presets = sresize(me->presets, me->presetsize,
+                                      game_params *);
+                me->preset_names = sresize(me->preset_names, me->presetsize,
+                                           char *);
+            }
+
+            me->presets[me->npresets] = preset;
+            me->preset_names[me->npresets] = name;
+            me->npresets++;
+        }
+    }
+
+    return me->npresets;
+}
+
+void midend_fetch_preset(midend_data *me, int n,
+                         char **name, game_params **params)
+{
+    assert(n >= 0 && n < me->npresets);
+    *name = me->preset_names[n];
+    *params = me->presets[n];
+}