X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/957099664a88cb1c3d83949355ca87043ae63d9b..b2a646f1af7858878025bdae14bef9482bee8e26:/gtk.c diff --git a/gtk.c b/gtk.c index 5e9de90..742c18c 100644 --- a/gtk.c +++ b/gtk.c @@ -9,9 +9,16 @@ #include #include +#include + #include #include +#include +#include +#include +#include + #include "puzzles.h" /* ---------------------------------------------------------------------- @@ -63,13 +70,24 @@ struct frontend { GdkGC *gc; int bbox_l, bbox_r, bbox_u, bbox_d; int timer_active, timer_id; + struct timeval last_time; struct font *fonts; int nfonts, fontsize; config_item *cfg; - int cfgret; + int cfg_which, cfgret; GtkWidget *cfgbox; + char *paste_data; + int paste_data_len; }; +void get_random_seed(void **randseed, int *randseedsize) +{ + struct timeval *tvp = snew(struct timeval); + gettimeofday(tvp, NULL); + *randseed = (void *)tvp; + *randseedsize = sizeof(struct timeval); +} + void frontend_default_colour(frontend *fe, float *output) { GdkColor col = fe->window->style->bg[GTK_STATE_NORMAL]; @@ -80,10 +98,14 @@ void frontend_default_colour(frontend *fe, float *output) void status_bar(frontend *fe, char *text) { + char *rewritten; + 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, text); + gtk_statusbar_push(GTK_STATUSBAR(fe->statusbar), fe->statusctx, rewritten); + sfree(rewritten); } void start_draw(frontend *fe) @@ -142,11 +164,60 @@ void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize, fe->fonts[i].type = fonttype; fe->fonts[i].size = fontsize; +#if GTK_CHECK_VERSION(2,0,0) /* - * FIXME: Really I should make at least _some_ effort to - * pick the correct font. + * Use Pango to find the closest match to the requested + * font. */ - fe->fonts[i].font = gdk_font_load("variable"); + { + PangoFontDescription *fd; + + fd = pango_font_description_new(); + /* `Monospace' and `Sans' are meta-families guaranteed to exist */ + pango_font_description_set_family(fd, fonttype == FONT_FIXED ? + "Monospace" : "Sans"); + pango_font_description_set_weight(fd, PANGO_WEIGHT_BOLD); + /* + * I found some online Pango documentation which + * described a function called + * pango_font_description_set_absolute_size(), which is + * _exactly_ what I want here. Unfortunately, none of + * my local Pango installations have it (presumably + * they're too old), so I'm going to have to hack round + * it by figuring out the point size myself. This + * limits me to X and probably also breaks in later + * Pango installations, so ideally I should add another + * CHECK_VERSION type ifdef and use set_absolute_size + * where available. All very annoying. + */ +#ifdef HAVE_SENSIBLE_ABSOLUTE_SIZE_FUNCTION + pango_font_description_set_absolute_size(fd, PANGO_SCALE*fontsize); +#else + { + Display *d = GDK_DISPLAY(); + int s = DefaultScreen(d); + double resolution = + (PANGO_SCALE * 72.27 / 25.4) * + ((double) DisplayWidthMM(d, s) / DisplayWidth (d, s)); + pango_font_description_set_size(fd, resolution * fontsize); + } +#endif + fe->fonts[i].font = gdk_font_from_description(fd); + pango_font_description_free(fd); + } + + if (!fe->fonts[i].font) +#endif + /* + * In GTK 1.2, I don't know of any plausible way to + * pick a suitable font, so I'm just going to be + * tedious. + * + * This is also fallback code called if the Pango + * approach fails to find an appropriate font. + */ + fe->fonts[i].font = gdk_font_load(fonttype == FONT_FIXED ? + "fixed" : "variable"); } /* @@ -155,11 +226,24 @@ void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize, { int lb, rb, wid, asc, desc; - gdk_string_extents(fe->fonts[i].font, text, + /* + * Measure vertical string extents with respect to the same + * string always... + */ + gdk_string_extents(fe->fonts[i].font, + "ABCDEFGHIJKLMNOPQRSTUVWXYZ", &lb, &rb, &wid, &asc, &desc); if (align & ALIGN_VCENTRE) y += asc - (asc+desc)/2; + /* + * ... but horizontal extents with respect to the provided + * string. This means that multiple pieces of text centred + * on the same y-coordinate don't have different baselines. + */ + gdk_string_extents(fe->fonts[i].font, text, + &lb, &rb, &wid, &asc, &desc); + if (align & ALIGN_HCENTRE) x -= wid / 2; else if (align & ALIGN_HRIGHT) @@ -228,6 +312,8 @@ void end_draw(frontend *fe) static void destroy(GtkWidget *widget, gpointer data) { + frontend *fe = (frontend *)data; + deactivate_timer(fe); gtk_main_quit(); } @@ -235,32 +321,42 @@ static gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) { frontend *fe = (frontend *)data; int keyval; + int shift = (event->state & GDK_SHIFT_MASK) ? MOD_SHFT : 0; + int ctrl = (event->state & GDK_CONTROL_MASK) ? MOD_CTRL : 0; if (!fe->pixmap) return TRUE; - if (event->string[0] && !event->string[1]) - keyval = (unsigned char)event->string[0]; - else if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up || - event->keyval == GDK_KP_8) - keyval = CURSOR_UP; - else if (event->keyval == GDK_Down || event->keyval == GDK_KP_Down || - event->keyval == GDK_KP_2) - keyval = CURSOR_DOWN; - else if (event->keyval == GDK_Left || event->keyval == GDK_KP_Left || - event->keyval == GDK_KP_4) - keyval = CURSOR_LEFT; - else if (event->keyval == GDK_Right || event->keyval == GDK_KP_Right || - event->keyval == GDK_KP_6) - keyval = CURSOR_RIGHT; + if (event->keyval == GDK_Up) + keyval = shift | ctrl | CURSOR_UP; + else if (event->keyval == GDK_KP_Up || event->keyval == GDK_KP_8) + keyval = MOD_NUM_KEYPAD | '8'; + else if (event->keyval == GDK_Down) + keyval = shift | ctrl | CURSOR_DOWN; + else if (event->keyval == GDK_KP_Down || event->keyval == GDK_KP_2) + keyval = MOD_NUM_KEYPAD | '2'; + else if (event->keyval == GDK_Left) + keyval = shift | ctrl | CURSOR_LEFT; + else if (event->keyval == GDK_KP_Left || event->keyval == GDK_KP_4) + keyval = MOD_NUM_KEYPAD | '4'; + else if (event->keyval == GDK_Right) + keyval = shift | ctrl | CURSOR_RIGHT; + else if (event->keyval == GDK_KP_Right || event->keyval == GDK_KP_6) + keyval = MOD_NUM_KEYPAD | '6'; else if (event->keyval == GDK_KP_Home || event->keyval == GDK_KP_7) - keyval = CURSOR_UP_LEFT; + keyval = MOD_NUM_KEYPAD | '7'; else if (event->keyval == GDK_KP_End || event->keyval == GDK_KP_1) - keyval = CURSOR_DOWN_LEFT; + keyval = MOD_NUM_KEYPAD | '1'; else if (event->keyval == GDK_KP_Page_Up || event->keyval == GDK_KP_9) - keyval = CURSOR_UP_RIGHT; + keyval = MOD_NUM_KEYPAD | '9'; else if (event->keyval == GDK_KP_Page_Down || event->keyval == GDK_KP_3) - keyval = CURSOR_DOWN_RIGHT; + keyval = MOD_NUM_KEYPAD | '3'; + else if (event->keyval == GDK_KP_Insert || event->keyval == GDK_KP_0) + keyval = MOD_NUM_KEYPAD | '0'; + else if (event->keyval == GDK_KP_Begin || event->keyval == GDK_KP_5) + keyval = MOD_NUM_KEYPAD | '5'; + else if (event->string[0] && !event->string[1]) + keyval = (unsigned char)event->string[0]; else keyval = -1; @@ -280,7 +376,7 @@ static gint button_event(GtkWidget *widget, GdkEventButton *event, if (!fe->pixmap) return TRUE; - if (event->type != GDK_BUTTON_PRESS) + if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) return TRUE; if (event->button == 2 || (event->state & GDK_SHIFT_MASK)) @@ -292,6 +388,33 @@ static gint button_event(GtkWidget *widget, GdkEventButton *event, else return FALSE; /* don't even know what button! */ + if (event->type == GDK_BUTTON_RELEASE) + button += LEFT_RELEASE - LEFT_BUTTON; + + if (!midend_process_key(fe->me, event->x, event->y, button)) + gtk_widget_destroy(fe->window); + + return TRUE; +} + +static gint motion_event(GtkWidget *widget, GdkEventMotion *event, + gpointer data) +{ + frontend *fe = (frontend *)data; + int button; + + if (!fe->pixmap) + return TRUE; + + if (event->state & (GDK_BUTTON2_MASK | GDK_SHIFT_MASK)) + button = MIDDLE_DRAG; + else if (event->state & GDK_BUTTON1_MASK) + button = LEFT_DRAG; + else if (event->state & GDK_BUTTON3_MASK) + button = RIGHT_DRAG; + else + return FALSE; /* don't even know what button! */ + if (!midend_process_key(fe->me, event->x, event->y, button)) gtk_widget_destroy(fe->window); @@ -345,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; } @@ -354,8 +477,15 @@ static gint timer_func(gpointer data) { frontend *fe = (frontend *)data; - if (fe->timer_active) - midend_timer(fe->me, 0.02); /* may clear timer_active */ + if (fe->timer_active) { + struct timeval now; + float elapsed; + gettimeofday(&now, NULL); + elapsed = ((now.tv_usec - fe->last_time.tv_usec) * 0.000001F + + (now.tv_sec - fe->last_time.tv_sec)); + midend_timer(fe->me, elapsed); /* may clear timer_active */ + fe->last_time = now; + } return fe->timer_active; } @@ -369,8 +499,10 @@ void deactivate_timer(frontend *fe) void activate_timer(frontend *fe) { - if (!fe->timer_active) + if (!fe->timer_active) { fe->timer_id = gtk_timeout_add(20, timer_func, fe); + gettimeofday(&fe->last_time, NULL); + } fe->timer_active = TRUE; } @@ -384,7 +516,22 @@ static void errmsg_button_clicked(GtkButton *button, gpointer data) gtk_widget_destroy(GTK_WIDGET(data)); } -void error_box(GtkWidget *parent, char *msg) +static int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) +{ + GtkObject *cancelbutton = GTK_OBJECT(data); + + /* + * `Escape' effectively clicks the cancel button + */ + if (event->keyval == GDK_Escape) { + gtk_signal_emit_by_name(GTK_OBJECT(cancelbutton), "clicked"); + return TRUE; + } + + return FALSE; +} + +void message_box(GtkWidget *parent, char *title, char *msg, int centre) { GtkWidget *window, *hbox, *text, *ok; @@ -397,7 +544,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), @@ -409,6 +556,8 @@ void error_box(GtkWidget *parent, char *msg) GTK_SIGNAL_FUNC(errmsg_button_clicked), window); gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(window_destroy), NULL); + gtk_signal_connect(GTK_OBJECT(window), "key_press_event", + GTK_SIGNAL_FUNC(win_key_press), ok); gtk_window_set_modal(GTK_WINDOW(window), TRUE); gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(parent)); //set_transient_window_pos(parent, window); @@ -416,12 +565,17 @@ 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; char *err; - err = midend_set_config(fe->me, fe->cfg); + err = midend_set_config(fe->me, fe->cfg_which, fe->cfg); if (err) error_box(fe->cfgbox, err); @@ -438,6 +592,27 @@ static void config_cancel_button_clicked(GtkButton *button, gpointer data) gtk_widget_destroy(fe->cfgbox); } +static int editbox_key(GtkWidget *widget, GdkEventKey *event, gpointer data) +{ + /* + * GtkEntry has a nasty habit of eating the Return key, which + * is unhelpful since it doesn't actually _do_ anything with it + * (it calls gtk_widget_activate, but our edit boxes never need + * activating). So I catch Return before GtkEntry sees it, and + * pass it straight on to the parent widget. Effect: hitting + * Return in an edit box will now activate the default button + * in the dialog just like it will everywhere else. + */ + if (event->keyval == GDK_Return && widget->parent != NULL) { + gint return_val; + gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event"); + gtk_signal_emit_by_name(GTK_OBJECT(widget->parent), "key_press_event", + event, &return_val); + return return_val; + } + return FALSE; +} + static void editbox_changed(GtkEditable *ed, gpointer data) { config_item *i = (config_item *)data; @@ -461,17 +636,20 @@ static void droplist_sel(GtkMenuItem *item, gpointer data) "user-data")); } -static int get_config(frontend *fe) +static int get_config(frontend *fe, int which) { - GtkWidget *w, *table; + GtkWidget *w, *table, *cancel; + char *title; config_item *i; int y; - fe->cfg = midend_get_config(fe->me); + fe->cfg = midend_get_config(fe->me, which, &title); + fe->cfg_which = which; fe->cfgret = FALSE; fe->cfgbox = gtk_dialog_new(); - gtk_window_set_title(GTK_WINDOW(fe->cfgbox), "Configure"); + gtk_window_set_title(GTK_WINDOW(fe->cfgbox), title); + sfree(title); w = gtk_button_new_with_label("OK"); gtk_box_pack_end(GTK_BOX(GTK_DIALOG(fe->cfgbox)->action_area), @@ -488,6 +666,7 @@ static int get_config(frontend *fe) gtk_widget_show(w); gtk_signal_connect(GTK_OBJECT(w), "clicked", GTK_SIGNAL_FUNC(config_cancel_button_clicked), fe); + cancel = w; table = gtk_table_new(1, 2, FALSE); y = 0; @@ -520,6 +699,8 @@ static int get_config(frontend *fe) gtk_entry_set_text(GTK_ENTRY(w), i->sval); gtk_signal_connect(GTK_OBJECT(w), "changed", GTK_SIGNAL_FUNC(editbox_changed), i); + gtk_signal_connect(GTK_OBJECT(w), "key_press_event", + GTK_SIGNAL_FUNC(editbox_key), NULL); gtk_widget_show(w); break; @@ -606,6 +787,8 @@ static int get_config(frontend *fe) gtk_signal_connect(GTK_OBJECT(fe->cfgbox), "destroy", GTK_SIGNAL_FUNC(window_destroy), NULL); + gtk_signal_connect(GTK_OBJECT(fe->cfgbox), "key_press_event", + GTK_SIGNAL_FUNC(win_key_press), cancel); gtk_window_set_modal(GTK_WINDOW(fe->cfgbox), TRUE); gtk_window_set_transient_for(GTK_WINDOW(fe->cfgbox), GTK_WINDOW(fe->window)); @@ -613,9 +796,7 @@ static int get_config(frontend *fe) gtk_widget_show(fe->cfgbox); gtk_main(); - /* - * FIXME: free fe->cfg - */ + free_cfg(fe->cfg); return fe->cfgret; } @@ -637,28 +818,170 @@ static void menu_preset_event(GtkMenuItem *menuitem, gpointer data) int x, y; midend_set_params(fe->me, params); - midend_new_game(fe->me, NULL); + midend_new_game(fe->me); midend_size(fe->me, &x, &y); gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y); fe->w = x; fe->h = y; } +GdkAtom compound_text_atom, utf8_string_atom; +int paste_initialised = FALSE; + +void init_paste() +{ + if (paste_initialised) + return; + + if (!compound_text_atom) + compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE); + if (!utf8_string_atom) + utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE); + + /* + * Ensure that all the cut buffers exist - according to the + * ICCCM, we must do this before we start using cut buffers. + */ + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, "", 0); +} + +/* Store data in a cut-buffer. */ +void store_cutbuffer(char *ptr, int len) +{ + /* ICCCM says we must rotate the buffers before storing to buffer 0. */ + XRotateBuffers(GDK_DISPLAY(), 1); + XStoreBytes(GDK_DISPLAY(), ptr, len); +} + +void write_clip(frontend *fe, char *data) +{ + init_paste(); + + if (fe->paste_data) + sfree(fe->paste_data); + + /* + * For this simple application we can safely assume that the + * data passed to this function is pure ASCII, which means we + * can return precisely the same stuff for types STRING, + * COMPOUND_TEXT or UTF8_STRING. + */ + + fe->paste_data = data; + fe->paste_data_len = strlen(data); + + store_cutbuffer(fe->paste_data, fe->paste_data_len); + + if (gtk_selection_owner_set(fe->area, GDK_SELECTION_PRIMARY, + CurrentTime)) { + gtk_selection_add_target(fe->area, GDK_SELECTION_PRIMARY, + GDK_SELECTION_TYPE_STRING, 1); + gtk_selection_add_target(fe->area, GDK_SELECTION_PRIMARY, + compound_text_atom, 1); + gtk_selection_add_target(fe->area, GDK_SELECTION_PRIMARY, + utf8_string_atom, 1); + } +} + +void selection_get(GtkWidget *widget, GtkSelectionData *seldata, + guint info, guint time_stamp, gpointer data) +{ + frontend *fe = (frontend *)data; + gtk_selection_data_set(seldata, seldata->target, 8, + fe->paste_data, fe->paste_data_len); +} + +gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata, + gpointer data) +{ + frontend *fe = (frontend *)data; + + if (fe->paste_data) + sfree(fe->paste_data); + fe->paste_data = NULL; + fe->paste_data_len = 0; + return TRUE; +} + +static void menu_copy_event(GtkMenuItem *menuitem, gpointer data) +{ + frontend *fe = (frontend *)data; + char *text; + + text = midend_text_format(fe->me); + + if (text) { + write_clip(fe, text); + } else { + gdk_beep(); + } +} + +static void menu_solve_event(GtkMenuItem *menuitem, gpointer data) +{ + frontend *fe = (frontend *)data; + char *msg; + + msg = midend_solve(fe->me); + + if (msg) + 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; + int which = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(menuitem), + "user-data")); int x, y; - if (!get_config(fe)) + if (!get_config(fe, which)) return; - midend_new_game(fe->me, NULL); + midend_new_game(fe->me); midend_size(fe->me, &x, &y); gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y); fe->w = x; 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) { @@ -679,7 +1002,7 @@ static void add_menu_separator(GtkContainer *cont) gtk_widget_show(menuitem); } -static frontend *new_window(void) +static frontend *new_window(char *game_id, char **error) { frontend *fe; GtkBox *vbox; @@ -688,11 +1011,23 @@ static frontend *new_window(void) fe = snew(frontend); - fe->me = midend_new(fe); - midend_new_game(fe->me, NULL); + 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) { + midend_free(fe->me); + sfree(fe); + return NULL; + } + } + midend_new_game(fe->me); fe->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(fe->window), game_name); + gtk_window_set_title(GTK_WINDOW(fe->window), thegame.name); #if 0 gtk_window_set_resizable(GTK_WINDOW(fe->window), FALSE); #else @@ -714,9 +1049,30 @@ static frontend *new_window(void) 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'); - if ((n = midend_num_presets(fe->me)) > 0 || game_can_configure) { + 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", + GTK_SIGNAL_FUNC(menu_config_event), fe); + gtk_widget_show(menuitem); + + if ((n = midend_num_presets(fe->me)) > 0 || thegame.can_configure) { GtkWidget *submenu; int i; @@ -741,8 +1097,10 @@ static frontend *new_window(void) gtk_widget_show(menuitem); } - if (game_can_configure) { + if (thegame.can_configure) { menuitem = gtk_menu_item_new_with_label("Custom..."); + gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", + GPOINTER_TO_INT(CFG_SETTINGS)); gtk_container_add(GTK_CONTAINER(submenu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(menu_config_event), fe); @@ -753,9 +1111,38 @@ static frontend *new_window(void) add_menu_separator(GTK_CONTAINER(menu)); add_menu_item_with_key(fe, GTK_CONTAINER(menu), "Undo", 'u'); add_menu_item_with_key(fe, GTK_CONTAINER(menu), "Redo", '\x12'); + if (thegame.can_format_as_text) { + add_menu_separator(GTK_CONTAINER(menu)); + menuitem = gtk_menu_item_new_with_label("Copy"); + gtk_container_add(GTK_CONTAINER(menu), menuitem); + gtk_signal_connect(GTK_OBJECT(menuitem), "activate", + GTK_SIGNAL_FUNC(menu_copy_event), fe); + gtk_widget_show(menuitem); + } + if (thegame.can_solve) { + add_menu_separator(GTK_CONTAINER(menu)); + menuitem = gtk_menu_item_new_with_label("Solve"); + gtk_container_add(GTK_CONTAINER(menu), menuitem); + gtk_signal_connect(GTK_OBJECT(menuitem), "activate", + GTK_SIGNAL_FUNC(menu_solve_event), fe); + gtk_widget_show(menuitem); + } 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; @@ -801,7 +1188,7 @@ static frontend *new_window(void) #if 0 /* For GTK 2.0, should we be using gtk_widget_set_size_request? */ #endif - gtk_widget_set_usize(viewport, x, req.height); + gtk_widget_set_usize(viewport, -1, req.height); } else fe->statusbar = NULL; @@ -817,7 +1204,8 @@ static frontend *new_window(void) fe->fonts = NULL; fe->nfonts = fe->fontsize = 0; - fe->timer_active = FALSE; + fe->paste_data = NULL; + fe->paste_data_len = 0; gtk_signal_connect(GTK_OBJECT(fe->window), "destroy", GTK_SIGNAL_FUNC(destroy), fe); @@ -825,6 +1213,14 @@ static frontend *new_window(void) GTK_SIGNAL_FUNC(key_event), fe); gtk_signal_connect(GTK_OBJECT(fe->area), "button_press_event", GTK_SIGNAL_FUNC(button_event), fe); + gtk_signal_connect(GTK_OBJECT(fe->area), "button_release_event", + GTK_SIGNAL_FUNC(button_event), fe); + gtk_signal_connect(GTK_OBJECT(fe->area), "motion_notify_event", + GTK_SIGNAL_FUNC(motion_event), fe); + gtk_signal_connect(GTK_OBJECT(fe->area), "selection_get", + GTK_SIGNAL_FUNC(selection_get), fe); + gtk_signal_connect(GTK_OBJECT(fe->area), "selection_clear_event", + GTK_SIGNAL_FUNC(selection_clear), fe); gtk_signal_connect(GTK_OBJECT(fe->area), "expose_event", GTK_SIGNAL_FUNC(expose_area), fe); gtk_signal_connect(GTK_OBJECT(fe->window), "map_event", @@ -832,7 +1228,10 @@ static frontend *new_window(void) gtk_signal_connect(GTK_OBJECT(fe->area), "configure_event", GTK_SIGNAL_FUNC(configure_area), fe); - gtk_widget_add_events(GTK_WIDGET(fe->area), GDK_BUTTON_PRESS_MASK); + gtk_widget_add_events(GTK_WIDGET(fe->area), + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_BUTTON_MOTION_MASK); gtk_widget_show(fe->area); gtk_widget_show(fe->window); @@ -842,11 +1241,93 @@ static frontend *new_window(void) int main(int argc, char **argv) { - srand(time(NULL)); + char *pname = argv[0]; + char *error; - gtk_init(&argc, &argv); - (void) new_window(); - gtk_main(); + 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 + * out and solved offline (for puzzles where that even makes + * sense - Solo, for example, is a lot more pencil-and-paper + * friendly than Net!) + * + * Usage: + * + * --generate [ []] + * + * , if present, is the number of puzzle IDs to generate. + * , if present, is the same type of parameter string + * you would pass to the puzzle when running it in GUI mode, + * including optional extras such as the expansion factor in + * Rectangles and the difficulty level in Solo. + * + * If you specify , you must also specify (although + * you may specify it to be 1). Sorry; that was the + * simplest-to-parse command-line syntax I came up with. + */ + if (argc > 1 && !strcmp(argv[1], "--generate")) { + int n = 1; + char *params = NULL, *seed = NULL; + game_params *par; + random_state *rs; + char *parstr; + + if (argc > 2) + n = atoi(argv[2]); + if (argc > 3) + params = argv[3]; + + 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 *desc = thegame.new_desc(par, rs, &aux, FALSE); + printf("%s:%s\n", parstr, desc); + sfree(desc); + if (aux) + thegame.free_aux_info(aux); + } + + return 0; + } else { + + gtk_init(&argc, &argv); + + if (!new_window(argc > 1 ? argv[1] : NULL, &error)) { + fprintf(stderr, "%s: %s\n", pname, error); + return 1; + } + + gtk_main(); + } return 0; }