140 Commits

Author SHA1 Message Date
79a77d53e1 Added a `--generate' command-line option in the GTK port of every
puzzle, to make it construcct puzzle IDs and output them on stdout.
Also checked in print.py, a script which reads puzzle IDs on stdin
and produces PostScript output. With these, you can generate pages
of Pattern, Rectangles and Solo puzzles to take on trains with you.

[originally from svn r5707]
2005-04-29 17:07:19 +00:00
d55d0b53f3 Correct block coordinate display when standalone solver shows its
working.

[originally from svn r5706]
2005-04-29 08:11:01 +00:00
df133c2297 Aha, even better: a Makefile hack that causes auto-detection of GTK
2 and fallback to GTK 1.2.

[originally from svn r5705]
2005-04-28 12:50:56 +00:00
3d4f276f1f Fix inconsistent vertical centring of text in GTK (and update Solo's
todo list, which complained about this because Solo was the only
puzzle noticeably affected).

[originally from svn r5694]
2005-04-27 19:44:34 +00:00
37a0c1af6a Patches for GTK 2. Puzzles already _built_ under GTK 2, but now it
builds better:
 - the GTK makefile now defines $(GTK_CONFIG) which you can
   override, so you can build for GTK 2 with no makefile-editing
   simply by running `make GTK_CONFIG="pkg_config gtk+-2.0"'
 - we use Pango to find appropriate fonts, which means the text in
   the puzzles actually (gasp!) adapts its size to the
   circumstances. Unfortunately, I've been unable to do this
   portably without depending on _either_ a Pango function that
   isn't present in older versions _or_ the underlying window system
   being X11; I'd appreciate someone doing better.

[originally from svn r5693]
2005-04-27 19:39:20 +00:00
8b31b4606c Command-line solver was dividing up non-square puzzles the wrong way
round.

[originally from svn r5691]
2005-04-27 16:59:18 +00:00
4ba97c64fe Pattern also contains an internal solver, so here's a command-line
interface to it just in case it comes in handy.

[originally from svn r5686]
2005-04-27 11:13:33 +00:00
37ad6698a5 The command-line solver's difficulty gradings now use the same
terminology as the puzzle GUI.

[originally from svn r5683]
2005-04-26 17:03:56 +00:00
070fb537cf Implement the remaining modes of reasoning in nsolve, and thus
enable configurable puzzle difficulty. I'm only generating grids up
to Times level (complicated non-recursive analysis but guessing
never required); I wouldn't object to providing a Telegraph
difficulty level (guessing required) but it turns out to be very
hard indeed to generate at random. I might still add it later
(probably under the name `Unreasonable' :-) if I can think of an
efficient way to find them.

[originally from svn r5682]
2005-04-26 11:19:00 +00:00
22ab2c0b82 Fix trivial UI glitch involving clicking on the border outside the
grid. I'm really starting to get annoyed by the default round-
towards-zero behaviour of C integer division.

[originally from svn r5681]
2005-04-26 08:20:25 +00:00
80129693bb Remove some legacy debugging code which was breaking the MinGW
build, and which is redundant given the new standalone solver
functionality.

[originally from svn r5672]
2005-04-25 14:37:33 +00:00
0fffbf32db Oops; _actually_ add the reasoning mode I mentioned in the last
checkin.

[originally from svn r5671]
2005-04-25 14:17:14 +00:00
a163926ed5 Various changes prompted by my boss taking an interest:
- added a compilation option -DSTANDALONE_SOLVER which makes both
   of Solo's internal solvers accessible from the command line.
 - fix a bug in nsolve turned up by testing in this mode: it failed
   to iterate at all! Oddly, this massive improvement to the
   effectiveness of nsolve hasn't emptied the generated grids by
   very much.
 - add an extra mode of reasoning to my to-do list (which is the
   dual of one already there, so I'm kicking myself).

[originally from svn r5670]
2005-04-25 14:03:53 +00:00
6bf62f4577 Outstandingly cute mathematical transformation which allows me to
lose a lot of code duplication in nsolve while preserving efficiency.

[originally from svn r5667]
2005-04-24 10:06:47 +00:00
f5138782b1 Introduce configurable symmetry type in generated puzzles, and drop
the default symmetry from order-4 down to order-2, which seems to
mitigate the excessively-full-grid problem by permitting more
freedom to remove stuff.

[originally from svn r5666]
2005-04-24 09:21:57 +00:00
3346ae2e54 Doc tweaks for Solo.
[originally from svn r5665]
2005-04-23 18:16:54 +00:00
c7085f0ffb Simplify clip region handling under Windows, which also makes Solo's
clipping policy work properly. I haven't proved why it didn't work
the previous way, but I have a good guess: I think that clip regions
are handled by reference. So I saved the old clip region out of the
DC, then did an IntersectClipRect, and then selected the old clip
region back in again - but the old clip region had never been
_de_-selected, because IntersectClipRect didn't change which object
was selected but rather it modified-in-place the one that already
was selected. So my attempt to restore the old clip region did
nothing whatsoever, and thus clipping to two different rectangles
during the same draw sequence failed. Now I'm completely destroying
the clip region during unclip(), which seems to work better.

[originally from svn r5662]
2005-04-23 17:09:19 +00:00
5b1235c369 Visual C points out a couple of typos.
[originally from svn r5661]
2005-04-23 16:41:35 +00:00
0c55b7e16f Initial checkin of `Solo', the number-placing puzzle popularised by
the Times under the name `Sudoku'.

[originally from svn r5660]
2005-04-23 16:35:28 +00:00
134418abf7 Oops. Just noticed that the Windows front end completely ignores the
`colour' parameter in draw_text().

[originally from svn r5507]
2005-03-15 14:24:45 +00:00
f64dcb909d Stop the Pattern grid generation from generating an entire row or
column of the same colour (at least when the dimensions are big
enough to make this feasible). It's a little bit too easy otherwise!

[originally from svn r5391]
2005-02-24 09:13:06 +00:00
e500ef9637 Fixes in grid generation for pedantic special cases when one or both
grid dimensions are very small.

[originally from svn r5390]
2005-02-24 08:13:32 +00:00
1c05db3fb5 I've found NSView's setNeedsDisplayInRect: method, which is
obviously better than just calling setNeedsDisplay on the whole
thing...

[originally from svn r5258]
2005-02-05 16:43:13 +00:00
c7b06e9c3a Need to impose a _maximum_ width on edit boxes, as well as a minimum
width; if allowed to resize to the text within them, they look
terribly silly when containing an entire Rectangles or Pattern game
ID.

[originally from svn r5210]
2005-01-25 21:19:28 +00:00
e4306a6036 Sanitising the mouse input data was a good idea, but my
implementation sucked. Revise it completely.

[originally from svn r5209]
2005-01-25 18:07:08 +00:00
8b91de196c Include code in midend.c to sanitise streams of mouse events so that
back ends can be assured of always receiving them in a sensible
sequence (button-down, followed by zero or more drags, followed by
button-up, and never changing button in the middle of such a
sequence). I have a suspicion this issue was the cause of the
mysterious Pattern grid updates seen by Dan during testing last
night.

[originally from svn r5208]
2005-01-25 14:07:46 +00:00
8ae25046d8 Ahem. Lots of stuff, including the new OS X sources, was being left
out of the tarball by makedist.sh, causing the downloaded source
tree to fail mkfiles.pl. Worse still, the GTK Makefile wasn't
included, so people _needed_ to run mkfiles.pl! Both now fixed, I
think.

[originally from svn r5205]
2005-01-25 09:07:54 +00:00
a88d1a459c Updates for OS X port (including updating copyright statements).
[originally from svn r5201]
2005-01-24 15:45:37 +00:00
0f323c585f Ahem. Rogue copy and paste was causing preset menu items to go into
the Help menu rather than the Type menu. Fixed.

[originally from svn r5199]
2005-01-24 14:10:16 +00:00
9aff566286 `make release' target, which builds a .dmg disk image in what
appears to be the approved Apple fashion.

[originally from svn r5197]
2005-01-24 13:44:24 +00:00
895844a9d9 Help should have the shortcut Command-?.
[originally from svn r5195]
2005-01-24 13:04:37 +00:00
1c47f2b553 Improve OS X help: split back up into multiple files (thanks to
Halibut's new \cfg{html-local-head} directive), and add some CSS to
mimic the font choices of system help files.

[originally from svn r5194]
2005-01-24 13:00:11 +00:00
b10be2b32a The #definition of COMBINED was done very badly: it was a piece of
platform-dependent code in puzzles.h (ick), which in turn depended
on the magic symbol MAC_OS_X being defined by mkfiles.pl itself
(yuck). Suddenly realised I can do much better simply by putting it
in an OS X makefile extras section in Recipe, and removing both
previous hacks. Much nicer.

[originally from svn r5191]
2005-01-24 12:09:51 +00:00
2040ff9631 First cut at online help under OS X. I just built the HTML version
of the manual using Halibut (with one additional magic tag in the
<HEAD> section), stuck it in the right part of the application
bundle, referenced it in Info.plist, and added a Help menu.
Everything else was automatic. Not bad!

[originally from svn r5190]
2005-01-24 12:05:21 +00:00
d8eb0de7c2 The main grid outline in Pattern was asymmetric between the top/left
edges and the bottom/right ones. Fix it. (Also remove it from the
todo list in osx.m, where I had entered it in the assumption that it
was a bug in my new OS X port! Turns out it's an entirely platform-
independent bug.)

[originally from svn r5187]
2005-01-24 10:50:17 +00:00
df155680f2 Fix two window-resizing bugs introduced by the addition of the status bar.
[originally from svn r5186]
2005-01-24 10:45:23 +00:00
6b89284c0e Improve fatal error handling.
[originally from svn r5185]
2005-01-24 10:35:54 +00:00
d90e909d66 Added a dock menu which makes it more convenient to launch a new
game window.

[originally from svn r5184]
2005-01-24 07:42:01 +00:00
5b695b8d8b Status bar support.
[originally from svn r5183]
2005-01-24 07:37:50 +00:00
bcbee006c5 Implemented the configurable dialog box mechanism, allowing custom
game sizes and entering of specific game IDs. I think this is now a
plausibly usable port, even if still by no means _finished_.

[originally from svn r5182]
2005-01-23 22:28:18 +00:00
0ae8782bc6 Added a framework for putting things other than the binary into a
Mac OS X application bundle, and provided an icon for Puzzles.

Also renamed the OS X source file from macosx.m to osx.m, so that it
can sit beside other things such as osx-info.plist and not cause
enormously long filenames.

[originally from svn r5179]
2005-01-23 11:20:31 +00:00
f80d9c6d49 Ah, no, _that_ fixes the malloc problem. I'd forgotten that midend.c
already takes care of managing the allocation of game presets, so
there's no need for me to introduce scary ObjC machinery to do so in
the frontend.

[originally from svn r5178]
2005-01-23 09:59:45 +00:00
fa9f4f4522 I _think_ this has just fixed an uninitialised-memory bug, but I'm
not sure.

[originally from svn r5177]
2005-01-23 09:37:16 +00:00
c166bdc645 Dynamically frob the menu bar to achieve selection of game presets.
[originally from svn r5176]
2005-01-23 09:17:46 +00:00
d85a505463 Flesh out the menus a bit.
[originally from svn r5175]
2005-01-23 08:36:24 +00:00
84a73c30ac Update TODO.
[originally from svn r5174]
2005-01-22 18:46:51 +00:00
11dad948a3 Initial checkin of a Mac OS X port of puzzles, using Cocoa. All
puzzles are compiled together into a single monolithic application
which allows you to select each one from one of its menus.

[originally from svn r5173]
2005-01-22 18:34:18 +00:00
a99de1be8f Arrange that we really _can_ compile all the puzzles into a single
binary if we choose: fix bugs in cube.c and sixteen.c that manifest
when compiled that way, and introduce list.c which provides a global
list of all the available puzzles.

[originally from svn r5169]
2005-01-22 15:29:01 +00:00
cc54553226 Rather than each game backend file exporting a whole load of
functions and a couple of variables, now each one exports a single
structure containing a load of function pointers and said variables.
This should make it easy to support platforms on which it's sensible
to compile all the puzzles into a single monolithic application. The
two existing platforms are still one-binary-per-game.

[originally from svn r5126]
2005-01-17 13:48:57 +00:00
46fa25240e Add a jumble' key (J') to Net, which scrambles the positions of all unlocked
tiles randomly. (Rachel asked for this; it's been being tested for a good few
months now, and Simon didn't care either way, so in it goes :)

As part of this, the front end can now be asked to provide a random random
seed (IYSWIM).

[originally from svn r5019]
2004-12-22 19:27:26 +00:00