X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/3c833d458bd4db0fe5ab9b5234e17eac28e0cab4..c8266e0330789dceef7ece0cd4fdcc927d0ac5fc:/gtk.c diff --git a/gtk.c b/gtk.c index 199225a..ab10a11 100644 --- a/gtk.c +++ b/gtk.c @@ -82,10 +82,10 @@ struct frontend { void get_random_seed(void **randseed, int *randseedsize) { - time_t *tp = snew(time_t); - time(tp); - *randseed = (void *)tp; - *randseedsize = sizeof(time_t); + struct timeval *tvp = snew(struct timeval); + gettimeofday(tvp, NULL); + *randseed = (void *)tvp; + *randseedsize = sizeof(struct timeval); } void frontend_default_colour(frontend *fe, float *output) @@ -525,7 +525,7 @@ static int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) return FALSE; } -void error_box(GtkWidget *parent, char *msg) +void message_box(GtkWidget *parent, char *title, char *msg, int centre) { GtkWidget *window, *hbox, *text, *ok; @@ -538,7 +538,7 @@ void error_box(GtkWidget *parent, char *msg) hbox, FALSE, FALSE, 20); gtk_widget_show(text); gtk_widget_show(hbox); - gtk_window_set_title(GTK_WINDOW(window), "Error"); + gtk_window_set_title(GTK_WINDOW(window), title); gtk_label_set_line_wrap(GTK_LABEL(text), TRUE); ok = gtk_button_new_with_label("OK"); gtk_box_pack_end(GTK_BOX(GTK_DIALOG(window)->action_area), @@ -559,6 +559,11 @@ void error_box(GtkWidget *parent, char *msg) gtk_main(); } +void error_box(GtkWidget *parent, char *msg) +{ + message_box(parent, "Error", msg, FALSE); +} + static void config_ok_button_clicked(GtkButton *button, gpointer data) { frontend *fe = (frontend *)data; @@ -932,6 +937,13 @@ static void menu_solve_event(GtkMenuItem *menuitem, gpointer data) error_box(fe->window, msg); } +static void menu_restart_event(GtkMenuItem *menuitem, gpointer data) +{ + frontend *fe = (frontend *)data; + + midend_restart_game(fe->me); +} + static void menu_config_event(GtkMenuItem *menuitem, gpointer data) { frontend *fe = (frontend *)data; @@ -949,6 +961,21 @@ static void menu_config_event(GtkMenuItem *menuitem, gpointer data) fe->h = y; } +static void menu_about_event(GtkMenuItem *menuitem, gpointer data) +{ + frontend *fe = (frontend *)data; + char titlebuf[256]; + char textbuf[1024]; + + sprintf(titlebuf, "About %.200s", thegame.name); + sprintf(textbuf, + "%.200s\n\n" + "from Simon Tatham's Portable Puzzle Collection\n\n" + "%.500s", thegame.name, ver); + + message_box(fe->window, titlebuf, textbuf, TRUE); +} + static GtkWidget *add_menu_item_with_key(frontend *fe, GtkContainer *cont, char *text, int key) { @@ -980,7 +1007,7 @@ static frontend *new_window(char *game_id, char **error) fe->me = midend_new(fe, &thegame); if (game_id) { - *error = midend_game_id(fe->me, game_id, FALSE); + *error = midend_game_id(fe->me, game_id); if (*error) { midend_free(fe->me); sfree(fe); @@ -1012,10 +1039,23 @@ static frontend *new_window(char *game_id, char **error) gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); add_menu_item_with_key(fe, GTK_CONTAINER(menu), "New", 'n'); - add_menu_item_with_key(fe, GTK_CONTAINER(menu), "Restart", 'r'); + + menuitem = gtk_menu_item_new_with_label("Restart"); + gtk_container_add(GTK_CONTAINER(menu), menuitem); + gtk_signal_connect(GTK_OBJECT(menuitem), "activate", + GTK_SIGNAL_FUNC(menu_restart_event), fe); + gtk_widget_show(menuitem); menuitem = gtk_menu_item_new_with_label("Specific..."); gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", + GINT_TO_POINTER(CFG_DESC)); + gtk_container_add(GTK_CONTAINER(menu), menuitem); + gtk_signal_connect(GTK_OBJECT(menuitem), "activate", + GTK_SIGNAL_FUNC(menu_config_event), fe); + gtk_widget_show(menuitem); + + menuitem = gtk_menu_item_new_with_label("Random Seed..."); + gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", GINT_TO_POINTER(CFG_SEED)); gtk_container_add(GTK_CONTAINER(menu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", @@ -1080,6 +1120,19 @@ static frontend *new_window(char *game_id, char **error) add_menu_separator(GTK_CONTAINER(menu)); add_menu_item_with_key(fe, GTK_CONTAINER(menu), "Exit", 'q'); + menuitem = gtk_menu_item_new_with_label("Help"); + gtk_container_add(GTK_CONTAINER(menubar), menuitem); + gtk_widget_show(menuitem); + + menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); + + menuitem = gtk_menu_item_new_with_label("About"); + gtk_container_add(GTK_CONTAINER(menu), menuitem); + gtk_signal_connect(GTK_OBJECT(menuitem), "activate", + GTK_SIGNAL_FUNC(menu_about_event), fe); + gtk_widget_show(menuitem); + { int i, ncolours; float *colours; @@ -1183,6 +1236,12 @@ int main(int argc, char **argv) char *pname = argv[0]; char *error; + if (argc > 1 && !strcmp(argv[1], "--version")) { + printf("%s, from Simon Tatham's Portable Puzzle Collection\n%s\n", + thegame.name, ver); + return 0; + } + /* * Special standalone mode for generating puzzle IDs on the * command line. Useful for generating puzzles to be printed @@ -1206,34 +1265,45 @@ int main(int argc, char **argv) */ if (argc > 1 && !strcmp(argv[1], "--generate")) { int n = 1; - char *params = NULL; + char *params = NULL, *seed = NULL; game_params *par; random_state *rs; char *parstr; - { - void *seed; - int seedlen; - get_random_seed(&seed, &seedlen); - rs = random_init(seed, seedlen); - } - if (argc > 2) n = atoi(argv[2]); if (argc > 3) params = argv[3]; - if (params) - par = thegame.decode_params(params); - else - par = thegame.default_params(); - parstr = thegame.encode_params(par); + par = thegame.default_params(); + if (params) { + if ( (seed = strchr(params, '#')) != NULL ) + *seed++ = '\0'; + thegame.decode_params(par, params); + } + if ((error = thegame.validate_params(par)) != NULL) { + fprintf(stderr, "%s: %s\n", pname, error); + return 1; + } + parstr = thegame.encode_params(par, FALSE); + + { + void *seeddata; + int seedlen; + if (seed) { + seeddata = seed; + seedlen = strlen(seed); + } else { + get_random_seed(&seeddata, &seedlen); + } + rs = random_init(seeddata, seedlen); + } while (n-- > 0) { game_aux_info *aux = NULL; - char *seed = thegame.new_seed(par, rs, &aux); - printf("%s:%s\n", parstr, seed); - sfree(seed); + char *desc = thegame.new_desc(par, rs, &aux); + printf("%s:%s\n", parstr, desc); + sfree(desc); if (aux) thegame.free_aux_info(aux); }