GTK misfires timers at inconvenient moments, sometimes causing a new

puzzle of a different size to be redrawn before the pixmap is
resized, and since backends never redraw already-drawn stuff this is
a problem. Was biting me when I entered a Mines game ID of a
different size than the current settings into the Specific box.

[originally from svn r5872]

diff --git a/gtk.c b/gtk.c
index 645b25038c010535942e1d9f65368206b8e805be..81aeda1df8936b4a214bf6ed06d34a91a269f917 100644 (file)
--- a/gtk.c
+++ b/gtk.c
@@ -468,7 +468,7 @@ static gint configure_area(GtkWidget *widget,
     gdk_draw_rectangle(fe->pixmap, gc, 1, 0, 0, fe->w, fe->h);
     gdk_gc_unref(gc);
 
-    midend_redraw(fe->me);
+    midend_force_redraw(fe->me);
 
     return TRUE;
 }

diff --git a/midend.c b/midend.c
index e8bcd206a0515bbd1b757d7eae4e863e80a9f933..de20e147301bf9d868b257ae2a37a080d05abf9d 100644 (file)
--- a/midend.c
+++ b/midend.c
@@ -132,6 +132,14 @@ static void midend_set_timer(midend_data *me)
        deactivate_timer(me->frontend);
 }
 
+void midend_force_redraw(midend_data *me)
+{
+    if (me->drawstate)
+        me->ourgame->free_drawstate(me->drawstate);
+    me->drawstate = me->ourgame->new_drawstate(me->states[0].state);
+    midend_redraw(me);
+}
+
 void midend_new_game(midend_data *me)
 {
     while (me->nstates > 0)

diff --git a/puzzles.h b/puzzles.h
index 4ee718e07bc1f9c086cedb599a73ebc18a8dc2b2..bf441c6b7ad5f1e02ba5a7ec4d08f39c01c66341 100644 (file)
--- a/puzzles.h
+++ b/puzzles.h
@@ -131,6 +131,7 @@ void midend_size(midend_data *me, int *x, int *y);
 void midend_new_game(midend_data *me);
 void midend_restart_game(midend_data *me);
 int midend_process_key(midend_data *me, int x, int y, int button);
+void midend_force_redraw(midend_data *me);
 void midend_redraw(midend_data *me);
 float *midend_colours(midend_data *me, int *ncolours);
 void midend_timer(midend_data *me, float tplus);