chiark / gitweb /
Ian Jackson [Wed, 14 Apr 2021 00:34:30 +0000 (01:34 +0100)]
drag select: half working, display is odd
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 18:53:10 +0000 (19:53 +0100)]
drag: Provide movehist_end in template
We're going to want to put things between this and static_defs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 23:44:43 +0000 (00:44 +0100)]
js: Break out ungrab_clicked
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 18:52:29 +0000 (19:52 +0100)]
dev: Fix a reference to zcoord
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 23:30:25 +0000 (00:30 +0100)]
doc: Document "1" to select 1 not-necessarily-topmost
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 23:28:42 +0000 (00:28 +0100)]
js: Handle first shift selection of count correctly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 23:21:46 +0000 (00:21 +0100)]
js: Fix shift counted select to only add
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 23:15:14 +0000 (00:15 +0100)]
js: Rework drag spread
Now it is coherent
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 22:42:24 +0000 (23:42 +0100)]
js: Do grab before drag
This is more consistent and will enable better refactoring
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 22:41:22 +0000 (23:41 +0100)]
js: Properly handle shift-click deselection
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 22:24:53 +0000 (23:24 +0100)]
js: Sort out allow_for_deselect
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 20:16:27 +0000 (21:16 +0100)]
js: Handle (counted) (de)selection better
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 20:15:22 +0000 (21:15 +0100)]
js: Break out inner function is_already()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 20:06:39 +0000 (21:06 +0100)]
js: Skip already-selected pieces for deselection in counted selection
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 20:05:50 +0000 (21:05 +0100)]
js: Provide ungrab_all_except (and PieceSet)
Nothing calls the new function yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 19:51:59 +0000 (20:51 +0100)]
js: Break out grab_clicked
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 19:47:23 +0000 (20:47 +0100)]
js: Prep mouse_find_predicate for drag selection
We don't want to bail if we bottomed out, unless an amount was
specified.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 19:46:58 +0000 (20:46 +0100)]
js: Handle counted selection of mixed held states
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 19:23:43 +0000 (20:23 +0100)]
js: Allow special select of pinned things in in wresting mode
We are going to reuse this code for drag select. Might as well let
this work, although it is a bit exciting and I think right now you
can't be in wresting mode and also special select.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 17:43:31 +0000 (18:43 +0100)]
Fix a typo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Apr 2021 17:41:27 +0000 (18:41 +0100)]
Merge remote-tracking branch 'aldabra/typos' into typos
(DCO confirmed via email.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Aldabra [Tue, 13 Apr 2021 08:58:38 +0000 (09:58 +0100)]
Proof-read
Ian Jackson [Mon, 12 Apr 2021 18:27:44 +0000 (19:27 +0100)]
js: Tiny reformat
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 12 Apr 2021 18:27:19 +0000 (19:27 +0100)]
js: Break out mouse_find_lowest
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 12 Apr 2021 18:25:21 +0000 (19:25 +0100)]
js: Break out mouse_predicate
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 12 Apr 2021 18:18:55 +0000 (19:18 +0100)]
js: Break out mouse_clicked_one
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 12 Apr 2021 18:09:49 +0000 (19:09 +0100)]
js: Break out mouse_find_clicked
Drag is going to want to change the way this is called.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Apr 2021 17:15:14 +0000 (18:15 +0100)]
Revert "locks: Make config an Option"
There's no point to this unless it helps us get rid of the
lazy_static! But it doesn't.
This reverts commit
79bf71d23437a33eaf4ce27f2d325d21508bb45e.
Ian Jackson [Fri, 9 Apr 2021 17:57:54 +0000 (18:57 +0100)]
script: Suppress default actions of our keystrokes
In particular, this means that pressing SPC to cancel a special
selection mode will no longer scroll the main window.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Apr 2021 16:47:34 +0000 (17:47 +0100)]
Abolish InstanceLockError, turning it into just GameBeingDestroyed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Apr 2021 16:27:10 +0000 (17:27 +0100)]
locks: Make config an Option
This makes it plausible to implement ConstDefault for it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Apr 2021 16:25:46 +0000 (17:25 +0100)]
docs/build: Add missing build-dep libtoml-parser-perl
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Apr 2021 15:58:13 +0000 (16:58 +0100)]
locks: Switch to parking_lot for everything
This gets rid of a lot of unwrap()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Apr 2021 15:45:29 +0000 (16:45 +0100)]
poison, locks: Rename lock_even_poisoned
Actually, this just checks for liveness now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Apr 2021 15:39:44 +0000 (16:39 +0100)]
poison, locks: Ignore all poisoning
This does more harm than good. Better to blunder on.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 19:59:18 +0000 (20:59 +0100)]
docs: sphinx-doc target: Print file: url
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 19:32:59 +0000 (20:32 +0100)]
docs: much work
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 18:53:06 +0000 (19:53 +0100)]
docs: rework build instructions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 18:32:07 +0000 (19:32 +0100)]
docs: wip work on build
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 18:27:11 +0000 (19:27 +0100)]
docs: Add sphnix-doc to full-check
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 18:26:33 +0000 (19:26 +0100)]
docs: Headings
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 18:21:01 +0000 (19:21 +0100)]
docs: Edit some metadata
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 18:14:24 +0000 (19:14 +0100)]
docs: Build not in spearate build/ subdir
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 18:12:11 +0000 (19:12 +0100)]
docs: Wire build into our top-level Makefile
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 17:43:32 +0000 (18:43 +0100)]
docs: sphnix build: Add a link for our stuff.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 17:42:00 +0000 (18:42 +0100)]
docs: sphinx build: Add our .md files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 17:41:50 +0000 (18:41 +0100)]
docs: sphnix build: Add markdown support
This is a bit crazy.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 17:18:22 +0000 (18:18 +0100)]
docs: sphnix build: Add a .gitignore
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 17:05:47 +0000 (18:05 +0100)]
docs: sphnix build: Reorganise a bit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 17:00:22 +0000 (18:00 +0100)]
docs: Run sphinx-quickstart and commit the results
There will be much editing of this, but at least note what we started
with.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 22:54:10 +0000 (23:54 +0100)]
docs: Start of reorganisation and much editing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Apr 2021 15:07:16 +0000 (16:07 +0100)]
Makefile: Honour new CARGO_DOC_OPTS variable
This can be used to limit the number of rustdoc processes when running
autotests.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 22:39:55 +0000 (23:39 +0100)]
shapelib: Fix sort order for playing cards to be actually bridge
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 18:17:49 +0000 (19:17 +0100)]
Prevent use of organise function when rotated
Add the proof token to the organise function, and check it in hand.
This only currently makes any difference for player labels, because
the other kinds of hand are unrotateable from load time.
Because we don't update uos on rotation, the player can try to
organise a rotated player label, but they will get an error.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 18:19:57 +0000 (19:19 +0100)]
Prevent occultation by rotated pieces
* Add a OcculterRotationChecked proof token to create_occultation
* Make a function to get the proof token from the GPiece
* In ui_operation (do the thing) functions, check it and plumb it through
* In the load functions, set rotateable to false
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 17:41:59 +0000 (18:41 +0100)]
Plumb ShowUnocculted through to ui_operation trait methods
We're going to want this.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 17:34:20 +0000 (18:34 +0100)]
rotateable: Provide PieceAngle::is_rotated
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 17:19:42 +0000 (18:19 +0100)]
rotateable: wip plumbing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 18:38:11 +0000 (19:38 +0100)]
updates: Fix json_len for piecestate to include some for fixed stuff
Empirically, this broke!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Apr 2021 16:39:12 +0000 (17:39 +0100)]
deck, hand: Do not move unless Wresting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 20:37:11 +0000 (21:37 +0100)]
organise: Better layouts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 20:23:55 +0000 (21:23 +0100)]
organise: Apply overlap limit positon to all methods
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 19:56:54 +0000 (20:56 +0100)]
organise: hanging: Show more clearly, whole of card ident
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 19:40:41 +0000 (20:40 +0100)]
deck: implement organise and sort function
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 19:13:57 +0000 (20:13 +0100)]
otterlib: Show sort order in preview
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 19:07:10 +0000 (20:07 +0100)]
Plumb sortkey through PieceTrait to otterlib
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 19:06:22 +0000 (20:06 +0100)]
otterlib: Break apart some html code (NFC)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 18:57:34 +0000 (19:57 +0100)]
cards-oxymoron: Provide sort key information
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 19:16:57 +0000 (20:16 +0100)]
shapelib: Provide sort key information
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 18:56:26 +0000 (19:56 +0100)]
shapelib: Add "extra fields" feature
We'll define one of these in a moment.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 18:54:21 +0000 (19:54 +0100)]
shapelib-toml: Add an internal comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 00:44:24 +0000 (01:44 +0100)]
shapelib: Rename Registry.libs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 00:23:45 +0000 (01:23 +0100)]
pcaliases: Tidy up
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 00:20:55 +0000 (01:20 +0100)]
Track Loaded_via_alias
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 00:14:51 +0000 (01:14 +0100)]
PieceSpec: Remove a spurious space
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 00:12:41 +0000 (01:12 +0100)]
pcaliases: split out
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 00:00:32 +0000 (01:00 +0100)]
shapelib: Make Registry capable of holding other things too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 20:34:02 +0000 (20:34 +0000)]
apitest: Tidy v slightly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Apr 2021 19:21:39 +0000 (20:21 +0100)]
Makefile: Do shapelib build too in full-check
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 17:18:46 +0000 (18:18 +0100)]
SynchLog: Fix message to not have a spurious apace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 17:26:17 +0000 (18:26 +0100)]
Makefile: fix for-wdt
Oops!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 17:05:54 +0000 (18:05 +0100)]
wdt-simple: Check a simple conflicting grasp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 17:03:10 +0000 (18:03 +0100)]
wdt-simple: Some whitespace changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 17:00:24 +0000 (18:00 +0100)]
wdt-simple: Use before_gen from sides, for first check
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 16:56:56 +0000 (17:56 +0100)]
wdriver: Return Generation, not a String, from synch
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 16:49:13 +0000 (17:49 +0100)]
wdt-simple: conflicts: Provide gen_before
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 16:47:40 +0000 (17:47 +0100)]
wdt-simple: conflicts: Count conflicts, don't just check existence
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 16:43:03 +0000 (17:43 +0100)]
wdt-simple: Ungrab for testing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 16:37:44 +0000 (17:37 +0100)]
wdt-simple: Break out check()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 16:16:38 +0000 (17:16 +0100)]
wdriver: LogIgnoreBefore: Use Html::lit impl
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 16:15:44 +0000 (17:15 +0100)]
wdriver: LogIgnoreBefore: More impls
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 16:12:41 +0000 (17:12 +0100)]
wdriver: Generalise LogIgnoreBefore
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 15:42:22 +0000 (16:42 +0100)]
SyncLog: new facility, will help us find messages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 15:42:04 +0000 (16:42 +0100)]
cmdlistener: Break out some_synch_core
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 15:41:39 +0000 (16:41 +0100)]
html: Format u64 too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 12:13:13 +0000 (13:13 +0100)]
js: Refactor api_piece to make most calls simpler
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 11:46:23 +0000 (12:46 +0100)]
api: grab: Reformat to allow us to override bits of Core
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 11:27:04 +0000 (12:27 +0100)]
wdt: Dump the game log into the test log, when we retrieve it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 11:25:07 +0000 (12:25 +0100)]
wdt: Assert that log collection basically worked
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 11:24:04 +0000 (12:24 +0100)]
Makefile: Provide for-at and for-wdt convenience targets
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log