#include <stdarg.h>
#include <string.h>
#include <errno.h>
+#include <math.h>
#include <sys/time.h>
#if !GTK_CHECK_VERSION(2,4,0)
# define OLD_FILESEL
#endif
+#if GTK_CHECK_VERSION(2,8,0)
+# define USE_CAIRO
+#endif
+/* #undef USE_CAIRO */
+/* #define NO_THICK_LINE */
#ifdef DEBUGGING
static FILE *debug_fp = NULL;
GtkAccelGroup *accelgroup;
GtkWidget *area;
GtkWidget *statusbar;
+ GtkWidget *menubar;
guint statusctx;
- GdkPixmap *pixmap;
- GdkColor *colours;
- int ncolours;
- GdkColormap *colmap;
int w, h;
midend *me;
+#ifdef USE_CAIRO
+ const float *colours;
+ cairo_t *cr;
+ cairo_surface_t *image;
+ GdkPixmap *pixmap;
+ GdkColor background; /* for painting outside puzzle area */
+#else
+ GdkPixmap *pixmap;
GdkGC *gc;
+ GdkColor *colours;
+ GdkColormap *colmap;
+ int backgroundindex; /* which of colours[] is background */
+#endif
+ int ncolours;
int bbox_l, bbox_r, bbox_u, bbox_d;
int timer_active, timer_id;
struct timeval last_time;
#ifdef OLD_FILESEL
char *filesel_name;
#endif
+ int drawing_area_shrink_pending;
GSList *preset_radio;
int n_preset_menu_items;
int preset_threaded;
GtkWidget *copy_menu_item;
};
+struct blitter {
+#ifdef USE_CAIRO
+ cairo_surface_t *image;
+#else
+ GdkPixmap *pixmap;
+#endif
+ int w, h, x, y;
+};
+
void get_random_seed(void **randseed, int *randseedsize)
{
struct timeval *tvp = snew(struct timeval);
gtk_statusbar_push(GTK_STATUSBAR(fe->statusbar), fe->statusctx, text);
}
-void gtk_start_draw(void *handle)
+/* ----------------------------------------------------------------------
+ * Cairo drawing functions.
+ */
+
+#ifdef USE_CAIRO
+
+static void setup_drawing(frontend *fe)
{
- frontend *fe = (frontend *)handle;
- fe->gc = gdk_gc_new(fe->area->window);
- fe->bbox_l = fe->w;
- fe->bbox_r = 0;
- fe->bbox_u = fe->h;
- fe->bbox_d = 0;
+ fe->cr = cairo_create(fe->image);
+ cairo_set_antialias(fe->cr, CAIRO_ANTIALIAS_GRAY);
+ cairo_set_line_width(fe->cr, 1.0);
+ cairo_set_line_cap(fe->cr, CAIRO_LINE_CAP_SQUARE);
+ cairo_set_line_join(fe->cr, CAIRO_LINE_JOIN_ROUND);
}
-void gtk_clip(void *handle, int x, int y, int w, int h)
+static void teardown_drawing(frontend *fe)
{
- frontend *fe = (frontend *)handle;
- GdkRectangle rect;
+ cairo_t *cr;
- rect.x = x;
- rect.y = y;
- rect.width = w;
- rect.height = h;
+ cairo_destroy(fe->cr);
+ fe->cr = NULL;
- gdk_gc_set_clip_rectangle(fe->gc, &rect);
+ cr = gdk_cairo_create(fe->pixmap);
+ cairo_set_source_surface(cr, fe->image, 0, 0);
+ cairo_rectangle(cr,
+ fe->bbox_l - 1,
+ fe->bbox_u - 1,
+ fe->bbox_r - fe->bbox_l + 2,
+ fe->bbox_d - fe->bbox_u + 2);
+ cairo_fill(cr);
+ cairo_destroy(cr);
}
-void gtk_unclip(void *handle)
+static void snaffle_colours(frontend *fe)
{
- frontend *fe = (frontend *)handle;
- GdkRectangle rect;
+ fe->colours = midend_colours(fe->me, &fe->ncolours);
+}
- rect.x = 0;
- rect.y = 0;
- rect.width = fe->w;
- rect.height = fe->h;
+static void set_colour(frontend *fe, int colour)
+{
+ cairo_set_source_rgb(fe->cr,
+ fe->colours[3*colour + 0],
+ fe->colours[3*colour + 1],
+ fe->colours[3*colour + 2]);
+}
- gdk_gc_set_clip_rectangle(fe->gc, &rect);
+static void set_window_background(frontend *fe, int colour)
+{
+ GdkColormap *colmap;
+
+ colmap = gdk_colormap_get_system();
+ fe->background.red = fe->colours[3*colour + 0] * 65535;
+ fe->background.green = fe->colours[3*colour + 1] * 65535;
+ fe->background.blue = fe->colours[3*colour + 2] * 65535;
+ if (!gdk_colormap_alloc_color(colmap, &fe->background, FALSE, FALSE)) {
+ g_error("couldn't allocate background (#%02x%02x%02x)\n",
+ fe->background.red >> 8, fe->background.green >> 8,
+ fe->background.blue >> 8);
+ }
+ gdk_window_set_background(fe->area->window, &fe->background);
+ gdk_window_set_background(fe->window->window, &fe->background);
}
-void gtk_draw_text(void *handle, int x, int y, int fonttype, int fontsize,
- int align, int colour, char *text)
+static PangoLayout *make_pango_layout(frontend *fe)
{
- frontend *fe = (frontend *)handle;
- int i;
+ return (pango_cairo_create_layout(fe->cr));
+}
- /*
- * Find or create the font.
- */
- for (i = 0; i < fe->nfonts; i++)
- if (fe->fonts[i].type == fonttype && fe->fonts[i].size == fontsize)
- break;
+static void draw_pango_layout(frontend *fe, PangoLayout *layout,
+ int x, int y)
+{
+ cairo_move_to(fe->cr, x, y);
+ pango_cairo_show_layout(fe->cr, layout);
+}
- if (i == fe->nfonts) {
- if (fe->fontsize <= fe->nfonts) {
- fe->fontsize = fe->nfonts + 10;
- fe->fonts = sresize(fe->fonts, fe->fontsize, struct font);
- }
+static void save_screenshot_png(frontend *fe, const char *screenshot_file)
+{
+ cairo_surface_write_to_png(fe->image, screenshot_file);
+}
- fe->nfonts++;
+static void do_clip(frontend *fe, int x, int y, int w, int h)
+{
+ cairo_new_path(fe->cr);
+ cairo_rectangle(fe->cr, x, y, w, h);
+ cairo_clip(fe->cr);
+}
- fe->fonts[i].type = fonttype;
- fe->fonts[i].size = fontsize;
+static void do_unclip(frontend *fe)
+{
+ cairo_reset_clip(fe->cr);
+}
-#ifdef USE_PANGO
- /*
- * Use Pango to find the closest match to the requested
- * font.
- */
- {
- 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].desc = fd;
- }
+static void do_draw_rect(frontend *fe, int x, int y, int w, int h)
+{
+ cairo_save(fe->cr);
+ cairo_new_path(fe->cr);
+ cairo_set_antialias(fe->cr, CAIRO_ANTIALIAS_NONE);
+ cairo_rectangle(fe->cr, x, y, w, h);
+ cairo_fill(fe->cr);
+ cairo_restore(fe->cr);
+}
-#else
- /*
- * 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.
- */
- fe->fonts[i].font = gdk_font_load(fonttype == FONT_FIXED ?
- "fixed" : "variable");
-#endif
+static void do_draw_line(frontend *fe, int x1, int y1, int x2, int y2)
+{
+ cairo_new_path(fe->cr);
+ cairo_move_to(fe->cr, x1 + 0.5, y1 + 0.5);
+ cairo_line_to(fe->cr, x2 + 0.5, y2 + 0.5);
+ cairo_stroke(fe->cr);
+}
+static void do_draw_thick_line(frontend *fe, float thickness,
+ float x1, float y1, float x2, float y2)
+{
+ cairo_save(fe->cr);
+ cairo_set_line_width(fe->cr, thickness);
+ cairo_new_path(fe->cr);
+ cairo_move_to(fe->cr, x1, y1);
+ cairo_line_to(fe->cr, x2, y2);
+ cairo_stroke(fe->cr);
+ cairo_restore(fe->cr);
+}
+
+static void do_draw_poly(frontend *fe, int *coords, int npoints,
+ int fillcolour, int outlinecolour)
+{
+ int i;
+
+ cairo_new_path(fe->cr);
+ for (i = 0; i < npoints; i++)
+ cairo_line_to(fe->cr, coords[i*2] + 0.5, coords[i*2 + 1] + 0.5);
+ cairo_close_path(fe->cr);
+ if (fillcolour >= 0) {
+ set_colour(fe, fillcolour);
+ cairo_fill_preserve(fe->cr);
}
+ assert(outlinecolour >= 0);
+ set_colour(fe, outlinecolour);
+ cairo_stroke(fe->cr);
+}
- /*
- * Set the colour.
- */
- gdk_gc_set_foreground(fe->gc, &fe->colours[colour]);
+static void do_draw_circle(frontend *fe, int cx, int cy, int radius,
+ int fillcolour, int outlinecolour)
+{
+ cairo_new_path(fe->cr);
+ cairo_arc(fe->cr, cx + 0.5, cy + 0.5, radius, 0, 2*PI);
+ cairo_close_path(fe->cr); /* Just in case... */
+ if (fillcolour >= 0) {
+ set_colour(fe, fillcolour);
+ cairo_fill_preserve(fe->cr);
+ }
+ assert(outlinecolour >= 0);
+ set_colour(fe, outlinecolour);
+ cairo_stroke(fe->cr);
+}
-#ifdef USE_PANGO
+static void setup_blitter(blitter *bl, int w, int h)
+{
+ bl->image = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h);
+}
- {
- PangoLayout *layout;
- PangoRectangle rect;
+static void teardown_blitter(blitter *bl)
+{
+ cairo_surface_destroy(bl->image);
+}
- /*
- * Create a layout.
- */
- layout = pango_layout_new(gtk_widget_get_pango_context(fe->area));
- pango_layout_set_font_description(layout, fe->fonts[i].desc);
- pango_layout_set_text(layout, text, strlen(text));
- pango_layout_get_pixel_extents(layout, NULL, &rect);
+static void do_blitter_save(frontend *fe, blitter *bl, int x, int y)
+{
+ cairo_t *cr = cairo_create(bl->image);
- if (align & ALIGN_VCENTRE)
- rect.y -= rect.height / 2;
- else
- rect.y -= rect.height;
+ cairo_set_source_surface(cr, fe->image, -x, -y);
+ cairo_paint(cr);
+ cairo_destroy(cr);
+}
- if (align & ALIGN_HCENTRE)
- rect.x -= rect.width / 2;
- else if (align & ALIGN_HRIGHT)
- rect.x -= rect.width;
+static void do_blitter_load(frontend *fe, blitter *bl, int x, int y)
+{
+ cairo_set_source_surface(fe->cr, bl->image, x, y);
+ cairo_paint(fe->cr);
+}
- gdk_draw_layout(fe->pixmap, fe->gc, rect.x + x, rect.y + y, layout);
+static void clear_backing_store(frontend *fe)
+{
+ fe->image = NULL;
+}
- g_object_unref(layout);
+static void setup_backing_store(frontend *fe)
+{
+ cairo_t *cr;
+ int i;
+
+ fe->pixmap = gdk_pixmap_new(fe->area->window, fe->pw, fe->ph, -1);
+ fe->image = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
+ fe->pw, fe->ph);
+
+ for (i = 0; i < 3; i++) {
+ switch (i) {
+ case 0: cr = cairo_create(fe->image); break;
+ case 1: cr = gdk_cairo_create(fe->pixmap); break;
+ case 2: cr = gdk_cairo_create(fe->area->window); break;
+ }
+ cairo_set_source_rgb(cr,
+ fe->colours[0], fe->colours[1], fe->colours[2]);
+ cairo_paint(cr);
+ cairo_destroy(cr);
}
+}
-#else
- /*
- * Find string dimensions and process alignment.
- */
- {
- int lb, rb, wid, asc, desc;
+static int backing_store_ok(frontend *fe)
+{
+ return (!!fe->image);
+}
- /*
- * 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;
- else
- y += asc;
+static void teardown_backing_store(frontend *fe)
+{
+ cairo_surface_destroy(fe->image);
+ gdk_pixmap_unref(fe->pixmap);
+ fe->image = NULL;
+}
- /*
- * ... 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);
+#endif
+
+/* ----------------------------------------------------------------------
+ * GDK drawing functions.
+ */
+
+#ifndef USE_CAIRO
+
+static void setup_drawing(frontend *fe)
+{
+ fe->gc = gdk_gc_new(fe->area->window);
+}
- if (align & ALIGN_HCENTRE)
- x -= wid / 2;
- else if (align & ALIGN_HRIGHT)
- x -= wid;
+static void teardown_drawing(frontend *fe)
+{
+ gdk_gc_unref(fe->gc);
+ fe->gc = NULL;
+}
+static void snaffle_colours(frontend *fe)
+{
+ int i, ncolours;
+ float *colours;
+ gboolean *success;
+
+ fe->colmap = gdk_colormap_get_system();
+ colours = midend_colours(fe->me, &ncolours);
+ fe->ncolours = ncolours;
+ fe->colours = snewn(ncolours, GdkColor);
+ for (i = 0; i < ncolours; i++) {
+ fe->colours[i].red = colours[i*3] * 0xFFFF;
+ fe->colours[i].green = colours[i*3+1] * 0xFFFF;
+ fe->colours[i].blue = colours[i*3+2] * 0xFFFF;
+ }
+ success = snewn(ncolours, gboolean);
+ gdk_colormap_alloc_colors(fe->colmap, fe->colours, ncolours,
+ FALSE, FALSE, success);
+ for (i = 0; i < ncolours; i++) {
+ if (!success[i]) {
+ g_error("couldn't allocate colour %d (#%02x%02x%02x)\n",
+ i, fe->colours[i].red >> 8,
+ fe->colours[i].green >> 8,
+ fe->colours[i].blue >> 8);
+ }
}
+}
- /*
- * Actually draw the text.
- */
- gdk_draw_string(fe->pixmap, fe->fonts[i].font, fe->gc, x, y, text);
+static void set_window_background(frontend *fe, int colour)
+{
+ fe->backgroundindex = colour;
+ gdk_window_set_background(fe->area->window, &fe->colours[colour]);
+ gdk_window_set_background(fe->window->window, &fe->colours[colour]);
+}
+
+static void set_colour(frontend *fe, int colour)
+{
+ gdk_gc_set_foreground(fe->gc, &fe->colours[colour]);
+}
+
+#ifdef USE_PANGO
+static PangoLayout *make_pango_layout(frontend *fe)
+{
+ return (pango_layout_new(gtk_widget_get_pango_context(fe->area)));
+}
+
+static void draw_pango_layout(frontend *fe, PangoLayout *layout,
+ int x, int y)
+{
+ gdk_draw_layout(fe->pixmap, fe->gc, x, y, layout);
+}
#endif
+static void save_screenshot_png(frontend *fe, const char *screenshot_file)
+{
+ GdkPixbuf *pb;
+ GError *gerror = NULL;
+
+ midend_redraw(fe->me);
+
+ pb = gdk_pixbuf_get_from_drawable(NULL, fe->pixmap,
+ NULL, 0, 0, 0, 0, -1, -1);
+ gdk_pixbuf_save(pb, screenshot_file, "png", &gerror, NULL);
}
-void gtk_draw_rect(void *handle, int x, int y, int w, int h, int colour)
+static void do_clip(frontend *fe, int x, int y, int w, int h)
+{
+ GdkRectangle rect;
+
+ rect.x = x;
+ rect.y = y;
+ rect.width = w;
+ rect.height = h;
+ gdk_gc_set_clip_rectangle(fe->gc, &rect);
+}
+
+static void do_unclip(frontend *fe)
+{
+ GdkRectangle rect;
+
+ rect.x = 0;
+ rect.y = 0;
+ rect.width = fe->w;
+ rect.height = fe->h;
+ gdk_gc_set_clip_rectangle(fe->gc, &rect);
+}
+
+static void do_draw_rect(frontend *fe, int x, int y, int w, int h)
{
- frontend *fe = (frontend *)handle;
- gdk_gc_set_foreground(fe->gc, &fe->colours[colour]);
gdk_draw_rectangle(fe->pixmap, fe->gc, 1, x, y, w, h);
}
-void gtk_draw_line(void *handle, int x1, int y1, int x2, int y2, int colour)
+static void do_draw_line(frontend *fe, int x1, int y1, int x2, int y2)
{
- frontend *fe = (frontend *)handle;
- gdk_gc_set_foreground(fe->gc, &fe->colours[colour]);
gdk_draw_line(fe->pixmap, fe->gc, x1, y1, x2, y2);
}
-void gtk_draw_poly(void *handle, int *coords, int npoints,
- int fillcolour, int outlinecolour)
+static void do_draw_thick_line(frontend *fe, float thickness,
+ float x1, float y1, float x2, float y2)
+{
+ GdkGCValues save;
+
+ gdk_gc_get_values(fe->gc, &save);
+ gdk_gc_set_line_attributes(fe->gc,
+ thickness,
+ GDK_LINE_SOLID,
+ GDK_CAP_BUTT,
+ GDK_JOIN_BEVEL);
+ gdk_draw_line(fe->pixmap, fe->gc, x1, y1, x2, y2);
+ gdk_gc_set_line_attributes(fe->gc,
+ save.line_width,
+ save.line_style,
+ save.cap_style,
+ save.join_style);
+}
+
+static void do_draw_poly(frontend *fe, int *coords, int npoints,
+ int fillcolour, int outlinecolour)
{
- frontend *fe = (frontend *)handle;
GdkPoint *points = snewn(npoints, GdkPoint);
int i;
}
if (fillcolour >= 0) {
- gdk_gc_set_foreground(fe->gc, &fe->colours[fillcolour]);
+ set_colour(fe, fillcolour);
gdk_draw_polygon(fe->pixmap, fe->gc, TRUE, points, npoints);
}
assert(outlinecolour >= 0);
- gdk_gc_set_foreground(fe->gc, &fe->colours[outlinecolour]);
+ set_colour(fe, outlinecolour);
/*
* In principle we ought to be able to use gdk_draw_polygon for
sfree(points);
}
-void gtk_draw_circle(void *handle, int cx, int cy, int radius,
- int fillcolour, int outlinecolour)
+static void do_draw_circle(frontend *fe, int cx, int cy, int radius,
+ int fillcolour, int outlinecolour)
{
- frontend *fe = (frontend *)handle;
if (fillcolour >= 0) {
- gdk_gc_set_foreground(fe->gc, &fe->colours[fillcolour]);
+ set_colour(fe, fillcolour);
gdk_draw_arc(fe->pixmap, fe->gc, TRUE,
cx - radius, cy - radius,
2 * radius, 2 * radius, 0, 360 * 64);
}
assert(outlinecolour >= 0);
- gdk_gc_set_foreground(fe->gc, &fe->colours[outlinecolour]);
+ set_colour(fe, outlinecolour);
gdk_draw_arc(fe->pixmap, fe->gc, FALSE,
cx - radius, cy - radius,
2 * radius, 2 * radius, 0, 360 * 64);
}
-struct blitter {
- GdkPixmap *pixmap;
- int w, h, x, y;
-};
-
-blitter *gtk_blitter_new(void *handle, int w, int h)
+static void setup_blitter(blitter *bl, int w, int h)
{
/*
* We can't create the pixmap right now, because fe->window
* might not yet exist. So we just cache w and h and create it
* during the firs call to blitter_save.
*/
- blitter *bl = snew(blitter);
bl->pixmap = NULL;
+}
+
+static void teardown_blitter(blitter *bl)
+{
+ if (bl->pixmap)
+ gdk_pixmap_unref(bl->pixmap);
+}
+
+static void do_blitter_save(frontend *fe, blitter *bl, int x, int y)
+{
+ if (!bl->pixmap)
+ bl->pixmap = gdk_pixmap_new(fe->area->window, bl->w, bl->h, -1);
+ gdk_draw_pixmap(bl->pixmap,
+ fe->area->style->fg_gc[GTK_WIDGET_STATE(fe->area)],
+ fe->pixmap,
+ x, y, 0, 0, bl->w, bl->h);
+}
+
+static void do_blitter_load(frontend *fe, blitter *bl, int x, int y)
+{
+ assert(bl->pixmap);
+ gdk_draw_pixmap(fe->pixmap,
+ fe->area->style->fg_gc[GTK_WIDGET_STATE(fe->area)],
+ bl->pixmap,
+ 0, 0, x, y, bl->w, bl->h);
+}
+
+static void clear_backing_store(frontend *fe)
+{
+ fe->pixmap = NULL;
+}
+
+static void setup_backing_store(frontend *fe)
+{
+ GdkGC *gc;
+
+ fe->pixmap = gdk_pixmap_new(fe->area->window, fe->pw, fe->ph, -1);
+
+ gc = gdk_gc_new(fe->area->window);
+ gdk_gc_set_foreground(gc, &fe->colours[0]);
+ gdk_draw_rectangle(fe->pixmap, gc, 1, 0, 0, fe->pw, fe->ph);
+ gdk_draw_rectangle(fe->area->window, gc, 1, 0, 0, fe->w, fe->h);
+ gdk_gc_unref(gc);
+}
+
+static int backing_store_ok(frontend *fe)
+{
+ return (!!fe->pixmap);
+}
+
+static void teardown_backing_store(frontend *fe)
+{
+ gdk_pixmap_unref(fe->pixmap);
+ fe->pixmap = NULL;
+}
+
+#endif
+
+static void repaint_rectangle(frontend *fe, GtkWidget *widget,
+ int x, int y, int w, int h)
+{
+ GdkGC *gc = gdk_gc_new(widget->window);
+#ifdef USE_CAIRO
+ gdk_gc_set_foreground(gc, &fe->background);
+#else
+ gdk_gc_set_foreground(gc, &fe->colours[fe->backgroundindex]);
+#endif
+ if (x < fe->ox) {
+ gdk_draw_rectangle(widget->window, gc,
+ TRUE, x, y, fe->ox - x, h);
+ w -= (fe->ox - x);
+ x = fe->ox;
+ }
+ if (y < fe->oy) {
+ gdk_draw_rectangle(widget->window, gc,
+ TRUE, x, y, w, fe->oy - y);
+ h -= (fe->oy - y);
+ y = fe->oy;
+ }
+ if (w > fe->pw) {
+ gdk_draw_rectangle(widget->window, gc,
+ TRUE, x + fe->pw, y, w - fe->pw, h);
+ w = fe->pw;
+ }
+ if (h > fe->ph) {
+ gdk_draw_rectangle(widget->window, gc,
+ TRUE, x, y + fe->ph, w, h - fe->ph);
+ h = fe->ph;
+ }
+ gdk_draw_pixmap(widget->window, gc, fe->pixmap,
+ x - fe->ox, y - fe->oy, x, y, w, h);
+ gdk_gc_unref(gc);
+}
+
+/* ----------------------------------------------------------------------
+ * Pango font functions.
+ */
+
+#ifdef USE_PANGO
+
+static void add_font(frontend *fe, int index, int fonttype, int fontsize)
+{
+ /*
+ * Use Pango to find the closest match to the requested
+ * font.
+ */
+ 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[index].desc = fd;
+}
+
+static void align_and_draw_text(frontend *fe,
+ int index, int align, int x, int y,
+ const char *text)
+{
+ PangoLayout *layout;
+ PangoRectangle rect;
+
+ layout = make_pango_layout(fe);
+
+ /*
+ * Create a layout.
+ */
+ pango_layout_set_font_description(layout, fe->fonts[index].desc);
+ pango_layout_set_text(layout, text, strlen(text));
+ pango_layout_get_pixel_extents(layout, NULL, &rect);
+
+ if (align & ALIGN_VCENTRE)
+ rect.y -= rect.height / 2;
+ else
+ rect.y -= rect.height;
+
+ if (align & ALIGN_HCENTRE)
+ rect.x -= rect.width / 2;
+ else if (align & ALIGN_HRIGHT)
+ rect.x -= rect.width;
+
+ draw_pango_layout(fe, layout, rect.x + x, rect.y + y);
+
+ g_object_unref(layout);
+}
+
+#endif
+
+/* ----------------------------------------------------------------------
+ * Old-fashioned font functions.
+ */
+
+#ifndef USE_PANGO
+
+static void add_font(int index, int fonttype, int fontsize)
+{
+ /*
+ * 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.
+ */
+ fe->fonts[i].font = gdk_font_load(fonttype == FONT_FIXED ?
+ "fixed" : "variable");
+}
+
+static void align_and_draw_text(int index, int align, int x, int y,
+ const char *text)
+{
+ int lb, rb, wid, asc, desc;
+
+ /*
+ * 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;
+ else
+ y += asc;
+
+ /*
+ * ... 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)
+ x -= wid;
+
+ /*
+ * Actually draw the text.
+ */
+ gdk_draw_string(fe->pixmap, fe->fonts[i].font, fe->gc, x, y, text);
+}
+
+#endif
+
+/* ----------------------------------------------------------------------
+ * The exported drawing functions.
+ */
+
+void gtk_start_draw(void *handle)
+{
+ frontend *fe = (frontend *)handle;
+ fe->bbox_l = fe->w;
+ fe->bbox_r = 0;
+ fe->bbox_u = fe->h;
+ fe->bbox_d = 0;
+ setup_drawing(fe);
+}
+
+void gtk_clip(void *handle, int x, int y, int w, int h)
+{
+ frontend *fe = (frontend *)handle;
+ do_clip(fe, x, y, w, h);
+}
+
+void gtk_unclip(void *handle)
+{
+ frontend *fe = (frontend *)handle;
+ do_unclip(fe);
+}
+
+void gtk_draw_text(void *handle, int x, int y, int fonttype, int fontsize,
+ int align, int colour, char *text)
+{
+ frontend *fe = (frontend *)handle;
+ int i;
+
+ /*
+ * Find or create the font.
+ */
+ for (i = 0; i < fe->nfonts; i++)
+ if (fe->fonts[i].type == fonttype && fe->fonts[i].size == fontsize)
+ break;
+
+ if (i == fe->nfonts) {
+ if (fe->fontsize <= fe->nfonts) {
+ fe->fontsize = fe->nfonts + 10;
+ fe->fonts = sresize(fe->fonts, fe->fontsize, struct font);
+ }
+
+ fe->nfonts++;
+
+ fe->fonts[i].type = fonttype;
+ fe->fonts[i].size = fontsize;
+ add_font(fe, i, fonttype, fontsize);
+ }
+
+ /*
+ * Do the job.
+ */
+ set_colour(fe, colour);
+ align_and_draw_text(fe, i, align, x, y, text);
+}
+
+void gtk_draw_rect(void *handle, int x, int y, int w, int h, int colour)
+{
+ frontend *fe = (frontend *)handle;
+ set_colour(fe, colour);
+ do_draw_rect(fe, x, y, w, h);
+}
+
+void gtk_draw_line(void *handle, int x1, int y1, int x2, int y2, int colour)
+{
+ frontend *fe = (frontend *)handle;
+ set_colour(fe, colour);
+ do_draw_line(fe, x1, y1, x2, y2);
+}
+
+void gtk_draw_thick_line(void *handle, float thickness,
+ float x1, float y1, float x2, float y2, int colour)
+{
+ frontend *fe = (frontend *)handle;
+ set_colour(fe, colour);
+ do_draw_thick_line(fe, thickness, x1, y1, x2, y2);
+}
+
+void gtk_draw_poly(void *handle, int *coords, int npoints,
+ int fillcolour, int outlinecolour)
+{
+ frontend *fe = (frontend *)handle;
+ do_draw_poly(fe, coords, npoints, fillcolour, outlinecolour);
+}
+
+void gtk_draw_circle(void *handle, int cx, int cy, int radius,
+ int fillcolour, int outlinecolour)
+{
+ frontend *fe = (frontend *)handle;
+ do_draw_circle(fe, cx, cy, radius, fillcolour, outlinecolour);
+}
+
+blitter *gtk_blitter_new(void *handle, int w, int h)
+{
+ blitter *bl = snew(blitter);
+ setup_blitter(bl, w, h);
bl->w = w;
bl->h = h;
return bl;
void gtk_blitter_free(void *handle, blitter *bl)
{
- if (bl->pixmap)
- gdk_pixmap_unref(bl->pixmap);
+ teardown_blitter(bl);
sfree(bl);
}
void gtk_blitter_save(void *handle, blitter *bl, int x, int y)
{
frontend *fe = (frontend *)handle;
- if (!bl->pixmap)
- bl->pixmap = gdk_pixmap_new(fe->area->window, bl->w, bl->h, -1);
+ do_blitter_save(fe, bl, x, y);
bl->x = x;
bl->y = y;
- gdk_draw_pixmap(bl->pixmap,
- fe->area->style->fg_gc[GTK_WIDGET_STATE(fe->area)],
- fe->pixmap,
- x, y, 0, 0, bl->w, bl->h);
}
void gtk_blitter_load(void *handle, blitter *bl, int x, int y)
{
frontend *fe = (frontend *)handle;
- assert(bl->pixmap);
if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) {
x = bl->x;
y = bl->y;
}
- gdk_draw_pixmap(fe->pixmap,
- fe->area->style->fg_gc[GTK_WIDGET_STATE(fe->area)],
- bl->pixmap,
- 0, 0, x, y, bl->w, bl->h);
+ do_blitter_load(fe, bl, x, y);
}
void gtk_draw_update(void *handle, int x, int y, int w, int h)
void gtk_end_draw(void *handle)
{
frontend *fe = (frontend *)handle;
- gdk_gc_unref(fe->gc);
- fe->gc = NULL;
+
+ teardown_drawing(fe);
if (fe->bbox_l < fe->bbox_r && fe->bbox_u < fe->bbox_d) {
- gdk_draw_pixmap(fe->area->window,
- fe->area->style->fg_gc[GTK_WIDGET_STATE(fe->area)],
- fe->pixmap,
- fe->bbox_l, fe->bbox_u,
- fe->ox + fe->bbox_l, fe->oy + fe->bbox_u,
- fe->bbox_r - fe->bbox_l, fe->bbox_d - fe->bbox_u);
+ repaint_rectangle(fe, fe->area,
+ fe->bbox_l - 1 + fe->ox,
+ fe->bbox_u - 1 + fe->oy,
+ fe->bbox_r - fe->bbox_l + 2,
+ fe->bbox_d - fe->bbox_u + 2);
}
}
#else
NULL,
#endif
+#ifdef NO_THICK_LINE
+ NULL,
+#else
+ gtk_draw_thick_line,
+#endif
};
static void destroy(GtkWidget *widget, gpointer data)
int shift = (event->state & GDK_SHIFT_MASK) ? MOD_SHFT : 0;
int ctrl = (event->state & GDK_CONTROL_MASK) ? MOD_CTRL : 0;
- if (!fe->pixmap)
+ if (!backing_store_ok(fe))
return TRUE;
#if !GTK_CHECK_VERSION(2,0,0)
frontend *fe = (frontend *)data;
int button;
- if (!fe->pixmap)
+ if (!backing_store_ok(fe))
return TRUE;
if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE)
frontend *fe = (frontend *)data;
int button;
- if (!fe->pixmap)
+ if (!backing_store_ok(fe))
return TRUE;
if (event->state & (GDK_BUTTON2_MASK | GDK_SHIFT_MASK))
{
frontend *fe = (frontend *)data;
- if (fe->pixmap) {
- gdk_draw_pixmap(widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
- fe->pixmap,
- event->area.x - fe->ox, event->area.y - fe->oy,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
+ if (backing_store_ok(fe)) {
+ repaint_rectangle(fe, widget,
+ event->area.x, event->area.y,
+ event->area.width, event->area.height);
}
return TRUE;
}
GdkEventConfigure *event, gpointer data)
{
frontend *fe = (frontend *)data;
- GdkGC *gc;
int x, y;
- if (fe->pixmap)
- gdk_pixmap_unref(fe->pixmap);
+ if (backing_store_ok(fe))
+ teardown_backing_store(fe);
x = fe->w = event->width;
y = fe->h = event->height;
fe->ox = (fe->w - fe->pw) / 2;
fe->oy = (fe->h - fe->ph) / 2;
- fe->pixmap = gdk_pixmap_new(widget->window, fe->pw, fe->ph, -1);
-
- gc = gdk_gc_new(fe->area->window);
- gdk_gc_set_foreground(gc, &fe->colours[0]);
- gdk_draw_rectangle(fe->pixmap, gc, 1, 0, 0, fe->pw, fe->ph);
- gdk_draw_rectangle(widget->window, gc, 1, 0, 0,
- event->width, event->height);
- gdk_gc_unref(gc);
-
+ setup_backing_store(fe);
midend_force_redraw(fe->me);
return TRUE;
gtk_label_set_line_wrap(GTK_LABEL(text), TRUE);
if (type == MB_OK) {
- titles = "OK\0";
+ titles = GTK_STOCK_OK "\0";
def = cancel = 0;
} else {
assert(type == MB_YESNO);
- titles = "Yes\0No\0";
- def = 0;
- cancel = 1;
+ titles = GTK_STOCK_NO "\0" GTK_STOCK_YES "\0";
+ def = 1;
+ cancel = 0;
}
i = 0;
while (*titles) {
- button = gtk_button_new_with_label(titles);
+ button = gtk_button_new_from_stock(titles);
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(window)->action_area),
button, FALSE, FALSE, 0);
gtk_widget_show(button);
gtk_widget_show(window);
i = -1;
gtk_main();
- return (type == MB_YESNO ? i == 0 : TRUE);
+ return (type == MB_YESNO ? i == 1 : TRUE);
}
void error_box(GtkWidget *parent, char *msg)
gtk_window_set_title(GTK_WINDOW(fe->cfgbox), title);
sfree(title);
- w = gtk_button_new_with_label("OK");
+ w = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(fe->cfgbox)->action_area),
w, FALSE, FALSE, 0);
gtk_widget_show(w);
- GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT);
- gtk_window_set_default(GTK_WINDOW(fe->cfgbox), w);
gtk_signal_connect(GTK_OBJECT(w), "clicked",
- GTK_SIGNAL_FUNC(config_ok_button_clicked), fe);
+ GTK_SIGNAL_FUNC(config_cancel_button_clicked), fe);
+ cancel = w;
- w = gtk_button_new_with_label("Cancel");
+ w = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(fe->cfgbox)->action_area),
w, FALSE, FALSE, 0);
gtk_widget_show(w);
+ GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT);
+ gtk_window_set_default(GTK_WINDOW(fe->cfgbox), w);
gtk_signal_connect(GTK_OBJECT(w), "clicked",
- GTK_SIGNAL_FUNC(config_cancel_button_clicked), fe);
- cancel = w;
+ GTK_SIGNAL_FUNC(config_ok_button_clicked), fe);
table = gtk_table_new(1, 2, FALSE);
y = 0;
}
}
+static gboolean not_size_allocated_yet(GtkWidget *w)
+{
+ /*
+ * This function tests whether a widget has not yet taken up space
+ * on the screen which it will occupy in future. (Therefore, it
+ * returns true only if the widget does exist but does not have a
+ * size allocation. A null widget is already taking up all the
+ * space it ever will.)
+ */
+ if (!w)
+ return FALSE; /* nonexistent widgets aren't a problem */
+
+#if GTK_CHECK_VERSION(2,18,0) /* skip if no gtk_widget_get_allocation */
+ {
+ GtkAllocation a;
+ gtk_widget_get_allocation(w, &a);
+ if (a.height == 0 || a.width == 0)
+ return TRUE; /* widget exists but has no size yet */
+ }
+#endif
+
+ return FALSE;
+}
+
+static void try_shrink_drawing_area(frontend *fe)
+{
+ if (fe->drawing_area_shrink_pending &&
+ !not_size_allocated_yet(fe->menubar) &&
+ !not_size_allocated_yet(fe->statusbar)) {
+ /*
+ * In order to permit the user to resize the window smaller as
+ * well as bigger, we call this function after the window size
+ * has ended up where we want it. This shouldn't shrink the
+ * window immediately; it just arranges that the next time the
+ * user tries to shrink it, they can.
+ *
+ * However, at puzzle creation time, we defer the first of
+ * these operations until after the menu bar and status bar
+ * are actually visible. On Ubuntu 12.04 I've found that these
+ * can take a while to be displayed, and that it's a mistake
+ * to reduce the drawing area's size allocation before they've
+ * turned up or else the drawing area makes room for them by
+ * shrinking to less than the size we intended.
+ */
+ gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), 1, 1);
+ fe->drawing_area_shrink_pending = FALSE;
+ }
+}
+
+static gint configure_window(GtkWidget *widget,
+ GdkEventConfigure *event, gpointer data)
+{
+ frontend *fe = (frontend *)data;
+ /*
+ * When the main puzzle window changes size, it might be because
+ * the menu bar or status bar has turned up after starting off
+ * absent, in which case we should have another go at enacting a
+ * pending shrink of the drawing area.
+ */
+ try_shrink_drawing_area(fe);
+ return FALSE;
+}
+
static void resize_fe(frontend *fe)
{
int x, y;
get_size(fe, &x, &y);
fe->w = x;
fe->h = y;
+ fe->drawing_area_shrink_pending = FALSE;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
{
GtkRequisition req;
gtk_widget_size_request(GTK_WIDGET(fe->window), &req);
gtk_window_resize(GTK_WINDOW(fe->window), req.width, req.height);
}
- /*
- * Now that we've established the preferred size of the window,
- * reduce the drawing area's size request so the user can shrink
- * the window.
- */
- gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), 1, 1);
+ fe->drawing_area_shrink_pending = TRUE;
+ try_shrink_drawing_area(fe);
}
static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
{
frontend *fe;
GtkBox *vbox, *hbox;
- GtkWidget *menubar, *menu, *menuitem;
+ GtkWidget *menu, *menuitem;
GdkPixmap *iconpm;
GList *iconlist;
int x, y, n;
gtk_box_pack_start(vbox, GTK_WIDGET(hbox), FALSE, FALSE, 0);
gtk_widget_show(GTK_WIDGET(hbox));
- menubar = gtk_menu_bar_new();
- gtk_box_pack_start(hbox, menubar, TRUE, TRUE, 0);
- gtk_widget_show(menubar);
+ fe->menubar = gtk_menu_bar_new();
+ gtk_box_pack_start(hbox, fe->menubar, TRUE, TRUE, 0);
+ gtk_widget_show(fe->menubar);
menuitem = gtk_menu_item_new_with_mnemonic("_Game");
- gtk_container_add(GTK_CONTAINER(menubar), menuitem);
+ gtk_container_add(GTK_CONTAINER(fe->menubar), menuitem);
gtk_widget_show(menuitem);
menu = gtk_menu_new();
int i;
menuitem = gtk_menu_item_new_with_mnemonic("_Type");
- gtk_container_add(GTK_CONTAINER(menubar), menuitem);
+ gtk_container_add(GTK_CONTAINER(fe->menubar), menuitem);
gtk_widget_show(menuitem);
submenu = gtk_menu_new();
add_menu_item_with_key(fe, GTK_CONTAINER(menu), "Exit", 'q');
menuitem = gtk_menu_item_new_with_mnemonic("_Help");
- gtk_container_add(GTK_CONTAINER(menubar), menuitem);
+ gtk_container_add(GTK_CONTAINER(fe->menubar), menuitem);
gtk_widget_show(menuitem);
menu = gtk_menu_new();
changed_preset(fe);
- {
- int i, ncolours;
- float *colours;
- gboolean *success;
-
- fe->colmap = gdk_colormap_get_system();
- colours = midend_colours(fe->me, &ncolours);
- fe->ncolours = ncolours;
- fe->colours = snewn(ncolours, GdkColor);
- for (i = 0; i < ncolours; i++) {
- fe->colours[i].red = colours[i*3] * 0xFFFF;
- fe->colours[i].green = colours[i*3+1] * 0xFFFF;
- fe->colours[i].blue = colours[i*3+2] * 0xFFFF;
- }
- success = snewn(ncolours, gboolean);
- gdk_colormap_alloc_colors(fe->colmap, fe->colours, ncolours,
- FALSE, FALSE, success);
- for (i = 0; i < ncolours; i++) {
- if (!success[i]) {
- g_error("couldn't allocate colour %d (#%02x%02x%02x)\n",
- i, fe->colours[i].red >> 8,
- fe->colours[i].green >> 8,
- fe->colours[i].blue >> 8);
- }
- }
- }
+ snaffle_colours(fe);
if (midend_wants_statusbar(fe->me)) {
GtkWidget *viewport;
fe->statusbar = NULL;
fe->area = gtk_drawing_area_new();
+#if GTK_CHECK_VERSION(2,0,0)
+ GTK_WIDGET_UNSET_FLAGS(fe->area, GTK_DOUBLE_BUFFERED);
+#endif
get_size(fe, &x, &y);
+ fe->drawing_area_shrink_pending = FALSE;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
fe->w = x;
fe->h = y;
gtk_box_pack_end(vbox, fe->area, TRUE, TRUE, 0);
- fe->pixmap = NULL;
+ clear_backing_store(fe);
fe->fonts = NULL;
fe->nfonts = fe->fontsize = 0;
GTK_SIGNAL_FUNC(map_window), fe);
gtk_signal_connect(GTK_OBJECT(fe->area), "configure_event",
GTK_SIGNAL_FUNC(configure_area), fe);
+ gtk_signal_connect(GTK_OBJECT(fe->window), "configure_event",
+ GTK_SIGNAL_FUNC(configure_window), fe);
gtk_widget_add_events(GTK_WIDGET(fe->area),
GDK_BUTTON_PRESS_MASK |
gtk_widget_show(fe->area);
gtk_widget_show(fe->window);
- /*
- * Now that we've established the preferred size of the window,
- * reduce the drawing area's size request so the user can shrink
- * the window.
- */
- gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), 1, 1);
-
- gdk_window_set_background(fe->area->window, &fe->colours[0]);
- gdk_window_set_background(fe->window->window, &fe->colours[0]);
+ fe->drawing_area_shrink_pending = TRUE;
+ try_shrink_drawing_area(fe);
+ set_window_background(fe, 0);
return fe;
}
}
}
- if (*errbuf) {
- fputs(errbuf, stderr);
- return 1;
- }
-
/*
* Special standalone mode for generating puzzle IDs on the
* command line. Useful for generating puzzles to be printed
char *id;
document *doc = NULL;
+ /*
+ * If we're in this branch, we should display any pending
+ * error message from the command line, since GTK isn't going
+ * to take another crack at making sense of it.
+ */
+ if (*errbuf) {
+ fputs(errbuf, stderr);
+ return 1;
+ }
+
n = ngenerate;
me = midend_new(NULL, &thegame, NULL, NULL);
char *realname = snewn(40 + strlen(savefile) +
strlen(savesuffix), char);
sprintf(realname, "%s%d%s", savefile, i, savesuffix);
+
+ if (soln) {
+ char *err = midend_solve(me);
+ if (err) {
+ fprintf(stderr, "%s: unable to show solution: %s\n",
+ realname, err);
+ return 1;
+ }
+ }
+
ctx.fp = fopen(realname, "w");
if (!ctx.fp) {
fprintf(stderr, "%s: open: %s\n", realname,
strerror(errno));
return 1;
}
- sfree(realname);
+ ctx.error = 0;
midend_serialise(me, savefile_write, &ctx);
if (ctx.error) {
fprintf(stderr, "%s: write: %s\n", realname,
strerror(errno));
return 1;
}
+ sfree(realname);
}
if (!doc && !savefile) {
id = midend_get_game_id(me);
}
if (screenshot_file) {
- GdkPixbuf *pb;
- GError *gerror = NULL;
-
- midend_redraw(fe->me);
-
- pb = gdk_pixbuf_get_from_drawable(NULL, fe->pixmap,
- NULL, 0, 0, 0, 0, -1, -1);
- gdk_pixbuf_save(pb, screenshot_file, "png", &gerror, NULL);
-
+ save_screenshot_png(fe, screenshot_file);
exit(0);
}
~mdw / sgt / puzzles / blobdiff