chiark / gitweb /
Ian Jackson [Sat, 20 Mar 2021 21:28:43 +0000 (21:28 +0000)]
clock: Give Y an extra per_move
This breaks detection of whether we're reset. We'll fix that in a
moment.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 21:23:24 +0000 (21:23 +0000)]
clock: Actually get per_move basically working
There are still some wrinkles.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 21:22:20 +0000 (21:22 +0000)]
clock: Fix per_move implementation (try to)
This still doesn't work when it needs to because typically the clock
is paused in both cases and this function then exits early.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 21:19:37 +0000 (21:19 +0000)]
clock: Plumb was_current through to do_start_or_stop
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 21:16:17 +0000 (21:16 +0000)]
penultima: clock: Add a per_move time to the spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 20:16:55 +0000 (20:16 +0000)]
clock: Implement per_move, but brokenly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 19:25:35 +0000 (19:25 +0000)]
clock: auto-swap active player
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 19:20:50 +0000 (19:20 +0000)]
clock: Fix spinning
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 19:20:13 +0000 (19:20 +0000)]
clock: Add a missing Debug derive
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 19:00:45 +0000 (19:00 +0000)]
clock: Some todos
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 18:47:04 +0000 (18:47 +0000)]
clock: Implement held_change_hook, at least in part
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 18:52:40 +0000 (18:52 +0000)]
clock: Break out unprepared_update()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 18:10:41 +0000 (18:10 +0000)]
clock: Implement the thread which actually counts
This is still not entirely right...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 18:47:41 +0000 (18:47 +0000)]
pass PieceId to held_change_hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 18:45:18 +0000 (18:45 +0000)]
pass &InstanceRef to held_change_hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 21:47:41 +0000 (21:47 +0000)]
prelude: Provide CLOCK_MONOTONIC too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 17:29:02 +0000 (17:29 +0000)]
global: Provide InstanceWeakRef
The chess clock is going to need this.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 16:56:36 +0000 (16:56 +0000)]
clock: Reset it on loading
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 16:53:25 +0000 (16:53 +0000)]
clock: Break out State::reset (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 16:50:17 +0000 (16:50 +0000)]
clock: svg: Position secs explicitly
The sigil might kern oddly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 16:48:07 +0000 (16:48 +0000)]
clock: svg: Break out "font", nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 16:47:59 +0000 (16:47 +0000)]
clock svg: wip, playing about
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 16:42:55 +0000 (16:42 +0000)]
clock: Actually send out the PieceImage updates
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 21:41:22 +0000 (21:41 +0000)]
clock: Sort out updates to actually work
We use the new Image facility, and use Unpredictable as approriate.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 21:40:46 +0000 (21:40 +0000)]
clock: impl Display for User and fix Debug to be debuggy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 12:40:54 +0000 (12:40 +0000)]
clock: Try making these all WRC::Unpredictable
This was flailing.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 19:47:25 +0000 (19:47 +0000)]
clock: User swap to other position
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 01:27:25 +0000 (01:27 +0000)]
clock: Some todos
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 01:23:36 +0000 (01:23 +0000)]
clock: Improve layout slightly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 01:19:40 +0000 (01:19 +0000)]
clock: Fix a typo in svg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 01:18:29 +0000 (01:18 +0000)]
clock: Prevent both users being the same
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 01:13:50 +0000 (01:13 +0000)]
clock: Use BadPieceStateForOperation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 00:20:13 +0000 (00:20 +0000)]
clock: implement ui_operation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 00:44:23 +0000 (00:44 +0000)]
clock: Rename fn initial_time
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 01:09:05 +0000 (01:09 +0000)]
Plumb &InstanceRef through to load()
clock will want this.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 01:05:46 +0000 (01:05 +0000)]
updates: log_did_to_piece*: take immutable GPlayer
Not sure why this took a mutable one ever...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 00:33:05 +0000 (00:33 +0000)]
prelude: Add POE
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 23:48:28 +0000 (23:48 +0000)]
clock: Implement add_ui_operations
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 00:40:34 +0000 (00:40 +0000)]
xdata: Some reformatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 00:38:24 +0000 (00:38 +0000)]
xdata: Provide get_mut_exp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 00:36:22 +0000 (00:36 +0000)]
xdata: Break out xdata_missing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 00:34:38 +0000 (00:34 +0000)]
xdata: Split out xdata_get_mut_inner
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 00:22:47 +0000 (00:22 +0000)]
clock: impl TryFrom<char> for User
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 00:20:41 +0000 (00:20 +0000)]
Rename BadClockUserError so we can reuse it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 19 Mar 2021 00:05:40 +0000 (00:05 +0000)]
plumb GameState into add_ui_operations
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 23:48:07 +0000 (23:48 +0000)]
clock: Rename Current from Running
This is the user whose turn it is but we might be paused, not running.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 23:34:56 +0000 (23:34 +0000)]
clock: finish display (more or less)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 23:25:48 +0000 (23:25 +0000)]
clock: svg adjustments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 23:23:56 +0000 (23:23 +0000)]
clock: svg adjustments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 21:29:37 +0000 (21:29 +0000)]
clock: svg adjustments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 21:26:35 +0000 (21:26 +0000)]
clock: svg adjustments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 18:04:53 +0000 (18:04 +0000)]
clock: wip rendering
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 21:11:06 +0000 (21:11 +0000)]
clock: Fix xdata typetag (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 21:10:11 +0000 (21:10 +0000)]
clock: actually load state
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 18:29:43 +0000 (18:29 +0000)]
Provide &InstanceRef in ApiPieceOpArgs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 16:09:46 +0000 (16:09 +0000)]
updates: Provide piece_update_image
This is the actual entrypoint
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 15:53:22 +0000 (15:53 +0000)]
Break out piece_updata_fallible_player (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 15:08:23 +0000 (15:08 +0000)]
Add an UnpreparedUpdates to PieceUpdateFromOpComplex
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 20 Mar 2021 14:03:19 +0000 (14:03 +0000)]
updates: New "PreparedUpdateEntry_Image"
This allows server code to just update the SVG without causing cseq
updates, conflicts, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 17:52:02 +0000 (17:52 +0000)]
clock: in URender, distinguish a lack of player
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 17:50:53 +0000 (17:50 +0000)]
clock: wip svg: Test no-player visibility
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 17:35:43 +0000 (17:35 +0000)]
clock: Abolish PMissing state
We're just going to let this be fine
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 17:32:46 +0000 (17:32 +0000)]
clock: Fix some comments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 17:32:35 +0000 (17:32 +0000)]
clock: Move timespec_serde into utils
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 03:10:30 +0000 (03:10 +0000)]
clock: Provide remaining as a TimeSpec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 02:57:22 +0000 (02:57 +0000)]
clock: Reformat a tiny bit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 19:45:03 +0000 (19:45 +0000)]
clock: Much wip code, compiles but doesn't do anything yet
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 02:10:11 +0000 (02:10 +0000)]
Import nix::TimeSpec etc.
This reverts commit
5edbc9c7fab27d77ef05216fbb5cd5b0b57c480c.
Ian Jackson [Tue, 16 Mar 2021 21:26:58 +0000 (21:26 +0000)]
clock: wip svg, wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 19:44:42 +0000 (19:44 +0000)]
clock: wip svg, wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 18:44:27 +0000 (18:44 +0000)]
clock: wip svg, wip, before clip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 18:36:51 +0000 (18:36 +0000)]
clock: wip svg, wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 18:36:23 +0000 (18:36 +0000)]
clock: wip svg, dump from game
We dump a pile of stuff c&p out of firefox
This lets us hack on the svg with low edit/test/review.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 18:11:22 +0000 (18:11 +0000)]
Plumb &GameState through into svg_piece
This is quite a lot of plumbing.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 23:37:29 +0000 (23:37 +0000)]
Provide GameState::dummy()
Fhis will be useful for otterlib.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 01:23:10 +0000 (01:23 +0000)]
Pass &mut GPiece to PieceSpec::load()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 22:54:49 +0000 (22:54 +0000)]
Some comments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 18:16:23 +0000 (18:16 +0000)]
clock: wip, skeleton
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 22:30:00 +0000 (22:30 +0000)]
Support held_change_hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 18:12:16 +0000 (18:12 +0000)]
updates: Move max_z update out of piece_update_player
We are going to want to pass &GameState to this so we can't pass any
&mut pieces of it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 23:51:51 +0000 (23:51 +0000)]
xdata: provide get_exp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 23:51:43 +0000 (23:51 +0000)]
xdata: Improve an error message slightly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 21:09:58 +0000 (21:09 +0000)]
xdata: Remove a now-redundant Default bound
We were trying to get rid of these, but missed this one.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 02:55:53 +0000 (02:55 +0000)]
remove some dead code warning suppressions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 01:41:20 +0000 (01:41 +0000)]
xdata: Replace use of Default with bespoke dummy() method
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 01:38:12 +0000 (01:38 +0000)]
xdata: Pass default function into get_mut etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 22:12:55 +0000 (22:12 +0000)]
UnpreparedUpdates: Rename types a bit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 21:58:47 +0000 (21:58 +0000)]
UnpreparedUpdates: Rename variable (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 21:57:28 +0000 (21:57 +0000)]
UnpreparedUpdates: Move and rename (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 18 Mar 2021 18:50:51 +0000 (18:50 +0000)]
Various internal errors, quote properly (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 12:59:21 +0000 (12:59 +0000)]
Makefile: Do not use --workspace for DEPLOY build
This makes it try to build a musl cdylib for otter-wasm, which it
can't. There doesn't seem to be a way to exclude this from cargo.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 12:50:10 +0000 (12:50 +0000)]
hidden: Slightly improve the bodge displacement algorithm
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 21:17:16 +0000 (21:17 +0000)]
penultima: Add a hand (for pawn choice at start)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 21:16:35 +0000 (21:16 +0000)]
hidden: ad-hoc bodge to improve view of displaced pices
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 16:06:35 +0000 (16:06 +0000)]
hidden: Fix an argument name to be consistent
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 16:06:07 +0000 (16:06 +0000)]
hidden: reformat arguments
Whitespace change only
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 01:25:33 +0000 (01:25 +0000)]
hidden: This reorganisation is done now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 01:25:28 +0000 (01:25 +0000)]
at: Check that we don't leak when we print messages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 15:56:37 +0000 (15:56 +0000)]
hidden: Get rid of now-unused parameters to log_did*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 13:18:46 +0000 (13:18 +0000)]
hidden: Fix descriptions in log messages to not leak
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log