X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/48dcdd627698354063fa1b551cfa1917dea1b25e..41184c244487c6f50cd174a0a913b02c5255aab9:/gtk.c

diff --git a/gtk.c b/gtk.c
index 84e5e72..deeb7a1 100644
--- a/gtk.c
+++ b/gtk.c
@@ -78,6 +78,7 @@ struct frontend {
     GtkWidget *cfgbox;
     char *paste_data;
     int paste_data_len;
+    char *laststatus;
 };
 
 void get_random_seed(void **randseed, int *randseedsize)
@@ -103,9 +104,14 @@ void status_bar(frontend *fe, char *text)
     assert(fe->statusbar);
 
     rewritten = midend_rewrite_statusbar(fe->me, text);
-    gtk_statusbar_pop(GTK_STATUSBAR(fe->statusbar), fe->statusctx);
-    gtk_statusbar_push(GTK_STATUSBAR(fe->statusbar), fe->statusctx, rewritten);
-    sfree(rewritten);
+    if (!fe->laststatus || strcmp(rewritten, fe->laststatus)) {
+	gtk_statusbar_pop(GTK_STATUSBAR(fe->statusbar), fe->statusctx);
+	gtk_statusbar_push(GTK_STATUSBAR(fe->statusbar), fe->statusctx, rewritten);
+	sfree(fe->laststatus);
+	fe->laststatus = rewritten;
+    } else {
+	sfree(rewritten);
+    }
 }
 
 void start_draw(frontend *fe)
@@ -468,7 +474,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;
 }
@@ -1011,7 +1017,11 @@ static frontend *new_window(char *game_id, char **error)
 
     fe = snew(frontend);
 
+    fe->timer_active = FALSE;
+    fe->timer_id = -1;
+
     fe->me = midend_new(fe, &thegame);
+
     if (game_id) {
         *error = midend_game_id(fe->me, game_id);
         if (*error) {
@@ -1200,7 +1210,7 @@ static frontend *new_window(char *game_id, char **error)
     fe->fonts = NULL;
     fe->nfonts = fe->fontsize = 0;
 
-    fe->timer_active = FALSE;
+    fe->laststatus = NULL;
 
     fe->paste_data = NULL;
     fe->paste_data_len = 0;
@@ -1307,7 +1317,7 @@ int main(int argc, char **argv)
 
 	while (n-- > 0) {
 	    game_aux_info *aux = NULL;
-	    char *desc = thegame.new_desc(par, rs, &aux);
+	    char *desc = thegame.new_desc(par, rs, &aux, FALSE);
 	    printf("%s:%s\n", parstr, desc);
 	    sfree(desc);
 	    if (aux)