815 Commits

Author SHA1 Message Date
9fbb365684 Introduce, and implement as usefully as I can in all front ends, a
new function in the drawing API which permits the display of text
from outside basic ASCII. A fallback mechanism is provided so that
puzzles can give a list of strings they'd like to display in order
of preference and the system will return the best one it can manage;
puzzles are required to cope with ASCII-only front ends.

[originally from svn r8793]
2009-12-27 10:01:16 +00:00
72922b3078 Tweak the semantics of dsf_merge() so that the canonical element of
any equivalence class is always the element with the smallest index.
This is slower (the previous behaviour, suggested by Jonas Koelker,
was to choose the new root element to maximise performance), but
still more than acceptably fast and more useful.

[originally from svn r8792]
2009-12-27 10:01:11 +00:00
189f833980 Refactor latin.c to make it easier to reuse. Instead of client
programs having to clone the latin_solver() function and insert
their own extra deduction routines, they can now just _call_
latin_solver with enough parameters to let it fit its own deductions
into their difficulty framework and call a set of provided function
pointers to do user deductions. Modified Unequal to work in the new
world, of course.

[originally from svn r8791]
2009-12-27 10:01:10 +00:00
b9c22e5cac New mode for Unequal, from James H. In this mode, called 'Adjacent',
the < and > clues are replaced by bars separating every pair of
squares whose contents differ by exactly 1. Unlike standard Unequal,
which presents only a subset of the available clues, in Adjacent the
clues are _all_ present, so you can deduce from the absence of a bar
that the two numbers it would separate are _not_ consecutive.

[originally from svn r8790]
2009-12-27 10:01:09 +00:00
d54b4c4651 latin_generate_quick is long gone, so remove it from the header file.
[originally from svn r8789]
2009-12-23 11:34:25 +00:00
2b06c12728 Keyboard control for Dominosa (patch largely due to James H, though
with considerable meddling from me).

[originally from svn r8788]
2009-12-22 16:47:42 +00:00
2bdabe31cf Jonas Koelker points out that the backspace key didn't work in GTK
Guess, because Guess expected ^H whereas GTK generated ^?. Other
puzzles that use Backspace do it by being prepared to see either,
which seems wasteful. Now the midend normalises both into ^H, so
front ends can generate whichever they like while puzzles can
safely just look for ^H.

[originally from svn r8786]
2009-12-20 10:01:57 +00:00
8628a0630c Minor bug fixes from James Harvey.
[originally from svn r8785]
2009-12-17 18:20:32 +00:00
97477f0916 Patches from Frode Austvik to modify the effects of the mouse
buttons in several games if STYLUS_BASED is defined: in games where
you can set a puzzle element to 'on', 'off' or 'not yet set', when
it's hard to mimic a second mouse button, it's better to have the
one 'button' cycle between all three states rather than from 'on'
back to 'unset'.

[originally from svn r8784]
2009-12-17 18:16:42 +00:00
6d5245d8bf Patch from Frode Austvik to tinker with the GTK interface if
compiling gtk.c with STYLUS_BASED defined: most notably, it provides
a row of numeric 'keys' made of GTK button widgets for puzzles that
want a numeric keypad.

[originally from svn r8783]
2009-12-17 18:12:18 +00:00
84d48aa074 Patch from Frode Austvik to permit passing CFLAGS in to the Unix
makefile.

[originally from svn r8782]
2009-12-17 17:55:42 +00:00
525370a569 Another wording tweak from Helge Kreutzmann.
[originally from svn r8780]
2009-12-13 12:47:10 +00:00
2ac017b62c Fix for the grid generation in the presence of particularly strange
grid types.

[originally from svn r8750]
2009-11-16 21:21:00 +00:00
9c95ea2619 Add a precautionary pair of initialisations to placate optimisers,
and asserts to check that the preinitialised values are never
actually used.

[originally from svn r8745]
2009-11-10 19:11:03 +00:00
ddbe9abe8a Remove ASCII-art arrows. Missing \dash (Debian bug #522439).
[originally from svn r8736]
2009-11-05 14:09:04 +00:00
92bd8da9c4 Beat up on Black Box docs, after Debian bug #548472.
[originally from svn r8735]
2009-11-04 13:19:39 +00:00
730462ab13 Typo fixes from Debian bug#554341.
[originally from svn r8734]
2009-11-04 12:06:32 +00:00
236889f6d6 Single mouse clicks to toggle individual grid edges stopped working
in r8414 as a side effect of reorganisation in interpret_move().
Reinstate them.

[originally from svn r8692]
[r8414 == 54801998744a69786a49ebe0688942ae7b57525b]
2009-10-13 17:09:42 +00:00
4f6e48e6be Add a couple of missing checks in validate_desc(), without which
bogus game IDs were getting as far as new_game() and failing
assertions.

[originally from svn r8655]
2009-09-16 12:57:07 +00:00
466c398a00 Minor rewording and typo-correction.
[originally from svn r8654]
2009-09-16 11:06:02 +00:00
ddfa693b0f Aha, I've managed to prove that my inadequate error highlighting is
actually just about adequate after all. Large comment added
containing some discussion and the proof.

[originally from svn r8653]
2009-09-16 10:57:11 +00:00
84d012998f Error-highlighted trees look nicer with a different-coloured trunk.
Also added a comment worrying about the universality of my error
highlighting mechanism.

[originally from svn r8647]
2009-09-13 14:43:21 +00:00
dfb8fa2e92 Redo Mines and Inertia's mine graphics using an actual circle rather
than an approximating octagon, to improve the look when zoomed to
high resolution.

[originally from svn r8646]
2009-09-13 13:08:34 +00:00
e2522c2897 Tweak to the promptness of error highlighting display.
[originally from svn r8645]
2009-09-12 12:54:49 +00:00
1b927c77b7 About time I got round to this: error highlighting for Tents.
[originally from svn r8644]
2009-09-12 12:30:43 +00:00
503f6650e9 Fix width/height braino introduced in r5844.
[originally from svn r8643]
[r5844 == 865e8ad6ca3d83ad2a585ceeb1809e9f68c18a20]
2009-09-09 18:22:14 +00:00
e794621861 Add execute permission to the .exe files inside the zip file.
[originally from svn r8634]
2009-08-28 17:43:44 +00:00
cfdba00313 More defensive-coding fixes from James H.
[originally from svn r8605]
2009-07-01 22:01:21 +00:00
652f03a8ae Patch from Mark Wooding: when I did r7980 I had completely failed to
notice that there was an _official_ way to have menu items marked as
selected or unselected, which is the GtkRadioMenuItem class. Replace
my ad-hoc use of bullet characters with that.

[originally from svn r8601]
[r7980 == ae6c7381272f84c0fd398f6d3e496f571ba42ec8]
2009-06-21 13:49:09 +00:00
93cd7ae62c Patch from Mark Wooding: use gdk_event_request_motions() where
available, which magically seems to eliminate most if not all of the
update lag when dragging a point in a large (say 250-point)
Untangle. I don't fully understand how this works, but it seems to!

[originally from svn r8600]
2009-06-21 13:39:54 +00:00
ec29642539 Patch from Mark Wooding: stop setting GTK_EXPAND for the x-direction
on labels in tables. The effect is that if you resize (e.g.) Solo's
configuration panel, the labels to the left of the various input
boxes will remain just big enough to fit their text in, and all the
extra space will be taken up by the useful part, i.e. the input
boxes themselves. Previously the labels and input boxes would expand
in a 1:1 ratio, causing lots of space to the right of the label text
that wasn't used for anything.

[originally from svn r8599]
2009-06-21 13:34:50 +00:00
767ec24009 Patch from Mark Wooding: one-pixel fix to the alignment of the
bottom and right edges of the Tents keyboard cursor.

[originally from svn r8598]
2009-06-21 13:28:43 +00:00
4ecc4f92d8 Patch from Mark Wooding (though somewhat tampered with by me): have
Loopy mark LINE_NO grid edges with very faint lines, instead of
leaving them totally undrawn. Helps in complex grid types where the
line layout isn't entirely obvious to a player not already familiar
with it. Disableable by setting LOOPY_FAINT_LINES=n in the
environment, just in case anyone turns out to seriously dislike it.
(You could probably disable it via LOOPY_COLOUR_6 too, but you'd
have to know the exact shade of your background to get that right.)

[originally from svn r8597]
2009-06-21 13:24:48 +00:00
0687980f0c Memory management and other fixes from James H.
[originally from svn r8596]
2009-06-17 20:01:45 +00:00
3cd83d05e8 Fix a misdesign I must have missed when I reviewed the Killer patch:
merge_some_cages() was written in the assumption that it would
always be able to do something, in that it returned void on success
and if it couldn't find anything to do it would just loop round
forever trying the same things over and over again.

Now it makes a methodical list of the pairs of cages which are merge
candidates, goes through them in a random order until it finds a
viable one, and returns a boolean indicating whether it succeeded or
ran out of candidates.

A test case which previously hung and now does not is "solo
--generate 1 7jxkdt#12345-10".

[originally from svn r8541]
2009-04-30 17:56:56 +00:00
4bb9232bcb check_valid() wasn't checking that Killer cages contain at most one
of each digit, and - perhaps more importantly - the display code
wasn't highlighting violations of that rule as an error. Fix both.

[originally from svn r8540]
2009-04-29 23:11:10 +00:00
c696ee2220 It's been a new year for some time now.
[originally from svn r8494]
2009-03-19 23:32:30 +00:00
66efa90048 Patch from James H to provide 16-bit-int cleanliness in Killer Solo.
[originally from svn r8489]
2009-03-02 23:32:43 +00:00
706e27de8d Patch from James H to abstract out of Dominosa the code which
randomly generates a tiling of a rectangle with dominoes, since he
wants to reuse that function in another puzzle.

[originally from svn r8488]
2009-03-02 19:45:59 +00:00
99ca11bf8b Make menus accessible from the keyboard in the Gtk front-end.
[originally from svn r8486]
2009-03-01 13:51:32 +00:00
cc7024b433 Fix cosmetic glitch in the interaction between Killer and Jigsaw
modes.

[originally from svn r8463]
2009-02-24 07:49:01 +00:00
649719a964 Make icon building cope with Solo's increased default tilesize as of r8455.
[originally from svn r8459]
[r8455 == 3d6de1eb47af21a9d9c0e6390b115febbf8b1d91]
2009-02-23 17:42:50 +00:00
87bd938ebf Fix duplicate keyword.
[originally from svn r8458]
2009-02-22 12:57:20 +00:00
3d6de1eb47 A substantial patch to Solo from Bernd Schmidt, adding support for
the 'Killer Sudoku' puzzle type. As a side effect I've had to
increase the default tile size of Solo, so that the extra numbers
drawn in the squares in Killer mode were still legible.

[originally from svn r8455]
2009-02-22 12:16:54 +00:00
407f29c46f Introduce some infrastructure to permit games' print functions to
draw dotted lines. No puzzle yet uses this, but one's about to.

[originally from svn r8453]
2009-02-22 12:05:38 +00:00
9249f09619 Fix the Java front end's vertical text positioning when
ALIGN_VNORMAL is in use: ALIGN_VNORMAL indicates that the supplied
y-coordinate denotes the _baseline_ of the text, not its top, so
adding on 'asc' to convert to the baseline is wrong.

This only affects Tents, at present.

[originally from svn r8452]
2009-02-22 12:02:40 +00:00
5027095ce2 Keyboard control patch for Bridges, from James H.
[originally from svn r8446]
2009-02-05 19:29:26 +00:00
279c678179 Lee Dowling points out that duplicating the entire grid data
structure in every game_state is terribly wasteful. Move all the
constant bits of it (i.e. everything except the per-square 'blue'
flag) into a ref-counted shared structure.

[originally from svn r8444]
2009-02-05 19:25:44 +00:00
918842835b Keyboard control patch for Black Box, from James H.
[originally from svn r8439]
2009-01-28 18:28:41 +00:00
8a3f525a54 Keyboard control patch for Twiddle, from James H.
[originally from svn r8438]
2009-01-28 18:27:10 +00:00