shithub: puzzles

--- a/blackbox.R

+++ b/blackbox.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-blackbox : [X] GTK COMMON blackbox

+blackbox : [X] GTK COMMON blackbox blackbox-icon|no-icon

 blackbox : [G] WINDOWS COMMON blackbox blackbox.res?

--- a/bridges.R

+++ b/bridges.R

@@ -2,7 +2,7 @@

 BRIDGES  = bridges dsf

-bridges  : [X] GTK COMMON BRIDGES

+bridges  : [X] GTK COMMON BRIDGES bridges-icon|no-icon

 bridges  : [G] WINDOWS COMMON BRIDGES bridges.res?

--- a/cube.R

+++ b/cube.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-cube     : [X] GTK COMMON cube

+cube     : [X] GTK COMMON cube cube-icon|no-icon

 cube     : [G] WINDOWS COMMON cube cube.res?

--- a/dominosa.R

+++ b/dominosa.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-dominosa : [X] GTK COMMON dominosa

+dominosa : [X] GTK COMMON dominosa dominosa-icon|no-icon

 dominosa : [G] WINDOWS COMMON dominosa dominosa.res?

--- a/fifteen.R

+++ b/fifteen.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-fifteen  : [X] GTK COMMON fifteen

+fifteen  : [X] GTK COMMON fifteen fifteen-icon|no-icon

 fifteen  : [G] WINDOWS COMMON fifteen fifteen.res?

--- a/flip.R

+++ b/flip.R

@@ -2,7 +2,7 @@

 FLIP     = flip tree234

-flip     : [X] GTK COMMON FLIP

+flip     : [X] GTK COMMON FLIP flip-icon|no-icon

 flip     : [G] WINDOWS COMMON FLIP flip.res?

--- a/gtk.c

+++ b/gtk.c

@@ -15,6 +15,8 @@

 #include <gtk/gtk.h>

 #include <gdk/gdkkeysyms.h>

+#include <gdk-pixbuf/gdk-pixbuf.h>

 #include <gdk/gdkx.h>

 #include <X11/Xlib.h>

 #include <X11/Xutil.h>

@@ -1458,8 +1460,12 @@

     frontend *fe;

     GtkBox *vbox;

     GtkWidget *menubar, *menu, *menuitem;

+    GdkPixmap *iconpm;

+    GList *iconlist;

     int x, y, n;

     char errbuf[1024];

+    extern char *const *const xpm_icons[];

+    extern const int n_xpm_icons;

     fe = snew(frontend);

@@ -1744,6 +1750,21 @@

                           GDK_BUTTON_PRESS_MASK |

                           GDK_BUTTON_RELEASE_MASK |

 			  GDK_BUTTON_MOTION_MASK);

+    if (n_xpm_icons) {

+	gtk_widget_realize(fe->window);

+	iconpm = gdk_pixmap_create_from_xpm_d(fe->window->window, NULL,

+					      NULL, (gchar **)xpm_icons[0]);

+	gdk_window_set_icon(fe->window->window, NULL, iconpm, NULL);

+	iconlist = NULL;

+	for (n = 0; n < n_xpm_icons; n++) {

+	    iconlist =

+		g_list_append(iconlist,

+			      gdk_pixbuf_new_from_xpm_data((const gchar **)

+							   xpm_icons[n]));

+	}

+	gdk_window_set_icon_list(fe->window->window, iconlist);

+    }

     gtk_widget_show(fe->area);

     gtk_widget_show(fe->window);

--- a/guess.R

+++ b/guess.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-guess    : [X] GTK COMMON guess

+guess    : [X] GTK COMMON guess guess-icon|no-icon

 guess    : [G] WINDOWS COMMON guess guess.res?

--- a/icons/Makefile

+++ b/icons/Makefile

@@ -19,6 +19,7 @@

 P16D8 = $(patsubst %,%-16d8.png,$(PUZZLES))

 P16D4 = $(patsubst %,%-16d4.png,$(PUZZLES))

 ICONS = $(patsubst %,%.ico,$(PUZZLES))

+CICONS = $(patsubst %,%-icon.c,$(PUZZLES))

 RC = $(patsubst %,%.rc,$(PUZZLES))

 BIN = ../

@@ -28,6 +29,7 @@

 web: $(WEB)

 pngicons: $(P48D24) $(P32D24) $(P16D24)

 winicons: $(ICONS) $(RC)

+gtkicons: $(CICONS)

 # Build the base puzzle screenshots from which all the other images

 # are derived. Some of them involve showing a move animation

@@ -120,5 +122,9 @@

 $(RC): %.rc:

 	echo '200 ICON "$*.ico"' > $@

+# Build the GTK icon source files.

+$(CICONS): %-icon.c: %-16d24.png %-32d24.png %-48d24.png

+	$(PIC)cicon.pl $^ > $@

 clean:

-	rm -f *.png *.ico *.rc

+	rm -f *.png *.ico *.rc *-icon.c

--- /dev/null

+++ b/icons/cicon.pl

@@ -1,0 +1,27 @@

+#!/usr/bin/perl

+# Given a list of input PNGs, create a C source file file

+# containing a const array of XPMs, under the name `xpm_icon'.

+$k = 0;

+@xpms = ();

+foreach $f (@ARGV) {

+  # XPM format is generated directly by ImageMagick, so that's easy

+  # enough. We just have to adjust the declaration line so that it

+  # has the right name, linkage and storage class.

+  @lines = ();

+  open XPM, "convert $f xpm:- |";

+  push @lines, $_ while <XPM>;

+  close XPM;

+  die "XPM from $f in unexpected format\n" unless $lines[1] =~ /^static.*\{$/;

+  $lines[1] = "static const char *const xpm_icon_$k"."[] = {\n";

+  $k++;

+  push @xpms, @lines, "\n";

+}

+# Now output.

+foreach $line (@xpms) { print $line; }

+print "const char *const *const xpm_icons[] = {\n";

+for ($i = 0; $i < $k; $i++) { print "    xpm_icon_$i,\n"; }

+print "};\n";

+print "const int n_xpm_icons = $k;\n";

--- a/inertia.R

+++ b/inertia.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-inertia  : [X] GTK COMMON inertia

+inertia  : [X] GTK COMMON inertia inertia-icon|no-icon

 inertia  : [G] WINDOWS COMMON inertia inertia.res?

--- a/lightup.R

+++ b/lightup.R

@@ -2,7 +2,7 @@

 LIGHTUP  = lightup combi

-lightup  : [X] GTK COMMON LIGHTUP

+lightup  : [X] GTK COMMON LIGHTUP lightup-icon|no-icon

 lightup  : [G] WINDOWS COMMON LIGHTUP lightup.res?

--- a/loopy.R

+++ b/loopy.R

@@ -2,7 +2,7 @@

 LOOPY    = loopy tree234 dsf

-loopy    : [X] GTK COMMON LOOPY

+loopy    : [X] GTK COMMON LOOPY loopy-icon|no-icon

 loopy    : [G] WINDOWS COMMON LOOPY loopy.res?

--- a/map.R

+++ b/map.R

@@ -2,7 +2,7 @@

 MAP      = map dsf

-map      : [X] GTK COMMON MAP

+map      : [X] GTK COMMON MAP map-icon|no-icon

 map      : [G] WINDOWS COMMON MAP map.res?

--- a/mines.R

+++ b/mines.R

@@ -2,7 +2,7 @@

 MINES    = mines tree234

-mines    : [X] GTK COMMON MINES

+mines    : [X] GTK COMMON MINES mines-icon|no-icon

 mines    : [G] WINDOWS COMMON MINES mines.res?

--- a/mkfiles.pl

+++ b/mkfiles.pl

@@ -131,11 +131,22 @@

       $type = substr($i,1,(length $i)-2);

     } else {

       if ($i =~ /\?$/) {

-	# Source files with a trailing question mark are optional:

+	# Object files with a trailing question mark are optional:

 	# the build can proceed fine without them, so we only use

-	# them if they're present.

+	# them if their primary source files are present.

 	$i =~ s/\?$//;

 	$i = undef unless defined &finddep($i);

+      } elsif ($i =~ /\|/) {

+	# Object file descriptions containing a vertical bar are

+	# lists of choices: we use the _first_ one whose primary

+	# source file is present.

+	@options = split /\|/, $i;

+	$j = undef;

+	foreach $k (@options) {

+	  $j=$k, last if defined &finddep($k);

+	}

+	die "no alternative found for $i\n" unless defined $j;

+	$i = $j;

       if (defined $i) {

 	push @$listref, $i;

--- a/net.R

+++ b/net.R

@@ -2,7 +2,7 @@

 NET      = net tree234 dsf

-net      : [X] GTK COMMON NET

+net      : [X] GTK COMMON NET net-icon|no-icon

 # The Windows Net shouldn't be called `net.exe' since Windows

 # already has a reasonably important utility program by that name!

--- a/netslide.R

+++ b/netslide.R

@@ -2,7 +2,7 @@

 NETSLIDE = netslide tree234

-netslide : [X] GTK COMMON NETSLIDE

+netslide : [X] GTK COMMON NETSLIDE netslide-icon|no-icon

 netslide : [G] WINDOWS COMMON NETSLIDE netslide.res?

--- /dev/null

+++ b/no-icon.c

@@ -1,0 +1,9 @@

+#include <X11/Intrinsic.h>

+/*

+ * Dummy source file which replaces the files generated in the

+ * `icons' subdirectory, when they're absent.

+ */

+const char *const *const xpm_icons[] = { 0 };

+const int n_xpm_icons = 0;

--- a/nullgame.R

+++ b/nullgame.R

@@ -8,5 +8,5 @@

 # it in the Makefile because it will be worse than useless if it

 # ever fails to compile, so it's important that it should actually

 # be built on a regular basis.

-nullgame : [X] GTK COMMON nullgame

+nullgame : [X] GTK COMMON nullgame nullgame-icon|no-icon

 nullgame : [G] WINDOWS COMMON nullgame

--- a/pattern.R

+++ b/pattern.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-pattern  : [X] GTK COMMON pattern

+pattern  : [X] GTK COMMON pattern pattern-icon|no-icon

 pattern  : [G] WINDOWS COMMON pattern pattern.res?

--- a/pegs.R

+++ b/pegs.R

@@ -2,7 +2,7 @@

 PEGS     = pegs tree234

-pegs     : [X] GTK COMMON PEGS

+pegs     : [X] GTK COMMON PEGS pegs-icon|no-icon

 pegs     : [G] WINDOWS COMMON PEGS pegs.res?

--- a/rect.R

+++ b/rect.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-rect     : [X] GTK COMMON rect

+rect     : [X] GTK COMMON rect rect-icon|no-icon

 rect     : [G] WINDOWS COMMON rect rect.res?

--- a/samegame.R

+++ b/samegame.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-samegame : [X] GTK COMMON samegame

+samegame : [X] GTK COMMON samegame samegame-icon|no-icon

 samegame : [G] WINDOWS COMMON samegame samegame.res?

--- a/sixteen.R

+++ b/sixteen.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-sixteen  : [X] GTK COMMON sixteen

+sixteen  : [X] GTK COMMON sixteen sixteen-icon|no-icon

 sixteen  : [G] WINDOWS COMMON sixteen sixteen.res?

--- a/slant.R

+++ b/slant.R

@@ -2,7 +2,7 @@

 SLANT    = slant dsf

-slant    : [X] GTK COMMON SLANT

+slant    : [X] GTK COMMON SLANT slant-icon|no-icon

 slant    : [G] WINDOWS COMMON SLANT slant.res?

--- a/solo.R

+++ b/solo.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-solo     : [X] GTK COMMON solo

+solo     : [X] GTK COMMON solo solo-icon|no-icon

 solo     : [G] WINDOWS COMMON solo solo.res?

--- a/tents.R

+++ b/tents.R

@@ -2,7 +2,7 @@

 TENTS    = tents maxflow

-tents    : [X] GTK COMMON TENTS

+tents    : [X] GTK COMMON TENTS tents-icon|no-icon

 tents    : [G] WINDOWS COMMON TENTS tents.res?

--- a/twiddle.R

+++ b/twiddle.R

@@ -1,6 +1,6 @@

 # -*- makefile -*-

-twiddle  : [X] GTK COMMON twiddle

+twiddle  : [X] GTK COMMON twiddle twiddle-icon|no-icon

 twiddle  : [G] WINDOWS COMMON twiddle twiddle.res?

--- a/untangle.R

+++ b/untangle.R

@@ -2,7 +2,7 @@

 UNTANGLE = untangle tree234

-untangle : [X] GTK COMMON UNTANGLE

+untangle : [X] GTK COMMON UNTANGLE untangle-icon|no-icon

 untangle : [G] WINDOWS COMMON UNTANGLE untangle.res?