chiark / gitweb /
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>
Ian Jackson [Mon, 5 Apr 2021 10:51:52 +0000 (11:51 +0100)]
wdt-hand: New test case for ungrab-then-regrab, setup
This demonstrates the problem but we don't actually check yet that it
went wrong.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 11:14:44 +0000 (12:14 +0100)]
cmdlistener: Synch: Make it save the game
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 10:38:43 +0000 (11:38 +0100)]
JS: Fix movehist arrow ends
This dasharray technique was just broken.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 10:16:39 +0000 (11:16 +0100)]
wdt-hand: Don't put these right on top of each other
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 02:46:23 +0000 (03:46 +0100)]
js: Disable drag-and-drop
Sometimes, but not always, I can trigger this; the card icon starts
floating about weirdly, the JS doesn't get a mouseup event, etc.,
Empirically this code seems enough to stop it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 02:00:27 +0000 (03:00 +0100)]
api: Rename api_raise to api_setz (for that is what it is)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 01:33:28 +0000 (02:33 +0100)]
sse: Rationalise server message
Drop K and U. They were useful for debugging the SSE, but the SSE is
working great and aren't really meaningful to anyone.
Also change the other strings somewhat.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 01:24:59 +0000 (02:24 +0100)]
mao: start with three decks
Perf is OK now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 01:07:48 +0000 (02:07 +0100)]
apitest: Fix some massively-over-verbose debug, tidy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 01:01:51 +0000 (02:01 +0100)]
apitest: Fix some massively-over-verbose debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 00:36:50 +0000 (01:36 +0100)]
js: Raise even multiple pieces, when dragging etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 23:15:09 +0000 (00:15 +0100)]
wdt-hand: Fix new test to actually fail
Well. It seems that if you have done click_and_hold in one window,
you can't do click in another. OK fine whatever.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 23:12:02 +0000 (00:12 +0100)]
wdt-hand: New test: Add a bit of dbg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 11:17:07 +0000 (12:17 +0100)]
wdt-hand: New test for interleaved drag and drop
This is supposed to have failed until just now. In fact, it needed
some souping up first...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 23:44:36 +0000 (00:44 +0100)]
Autoraise on ungrab, where applicable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 00:17:44 +0000 (01:17 +0100)]
utils: Provide wantok macro
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 23:44:49 +0000 (00:44 +0100)]
gamestate: Provide bbox_abs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 22:11:48 +0000 (23:11 +0100)]
wdriver: Provide WindowGuard::pieces()
No caller yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 23:11:44 +0000 (00:11 +0100)]
apitest: Fix did message to mention "did"
This makes one less thing to think about when grepping.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 00:29:25 +0000 (01:29 +0100)]
js: Rename and simplify set_grab_us
This only ever takes us as an argument.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 00:24:38 +0000 (01:24 +0100)]
js: Fold api call into do_ungrab (renaming that function)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Apr 2021 00:20:18 +0000 (01:20 +0100)]
js: Fix a ws problem
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 23:30:32 +0000 (00:30 +0100)]
ZLevel: Track max zg Generation too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 23:15:15 +0000 (00:15 +0100)]
apitest: run1: Log more lines
This works better with our more debug that we have had for a while.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 19:28:39 +0000 (20:28 +0100)]
tests: Rename always_context to did and use it a lot more
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 19:23:18 +0000 (20:23 +0100)]
apitest: Use #[ext] a bit more
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 00:21:05 +0000 (01:21 +0100)]
mao: Move hand positions so overhang is less obnoxious
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 23:59:34 +0000 (00:59 +0100)]
js: Multi select, make drag_delta more persistent
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 23:50:43 +0000 (00:50 +0100)]
js: Multi select, actually ungrab them all
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 23:46:17 +0000 (00:46 +0100)]
js: Multi select, actually select as many as we want!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 23:41:05 +0000 (00:41 +0100)]
js: Multi select auto spread
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 23:40:54 +0000 (00:40 +0100)]
js: Handle special_count of >1, do not pick 4 topmost whatever
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 23:31:19 +0000 (00:31 +0100)]
js: Handle special_count of >1
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 23:20:24 +0000 (00:20 +0100)]
js: special count: Cancel it after we've used it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 22:10:24 +0000 (23:10 +0100)]
js: Handle special_count of zero
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 22:53:54 +0000 (23:53 +0100)]
js: Provide mouseevent_pos
Empirically this seems to work.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 22:54:28 +0000 (23:54 +0100)]
js: cursor: Make it default to "auto"
Weirdly this SVG cursor disappears near the edge of the screen. WTF.
Anyway, I should fix the fallback.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 21:58:23 +0000 (22:58 +0100)]
js: Introduce Rect type alias
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 21:51:33 +0000 (22:51 +0100)]
js: Break out clicked_now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 21:45:02 +0000 (22:45 +0100)]
js: Prepare drag_mousedown for multiclick
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 21:28:41 +0000 (22:28 +0100)]
Pass bbox to js
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 21:12:52 +0000 (22:12 +0100)]
special selection: show details in hint for SPC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 21:06:21 +0000 (22:06 +0100)]
special selection: special case for zero
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 20:51:19 +0000 (21:51 +0100)]
special selection: drop a debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 20:49:53 +0000 (21:49 +0100)]
special selection: show hint for SPC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 20:44:38 +0000 (21:44 +0100)]
special selection: wip key handling
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 23:19:07 +0000 (00:19 +0100)]
js: Avoid duplicate handling of keystrokes
We didn't notice that keys you type into input boxes (currently, just
zoom) get fed to the play interpreter too, because you would only type
digits there which are ignored.
But we are about to pay attention to digits.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:45:51 +0000 (18:45 +0100)]
movehist: Postpone a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:45:14 +0000 (18:45 +0100)]
movehist: Postpone a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:44:06 +0000 (18:44 +0100)]
clock: Allow clearing another player from a place at the clock
I don't think this really calls for Wresting. It's not like you'd do
it by mistake.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:37:20 +0000 (18:37 +0100)]
penultima: Fix a broken player label
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:31:31 +0000 (18:31 +0100)]
mao: Put hands in the right Z order
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:27:15 +0000 (18:27 +0100)]
Click on background clears yellow haloes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:23:18 +0000 (18:23 +0100)]
organise: Use new *Quiet for moving the pieces into place
This means that when you organise your own hand you don't see lots of
yellow stuff.
Others still see that and may need to clear it somehow.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:17:14 +0000 (18:17 +0100)]
js: Centralise piece_set_zlevel_from
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:13:32 +0000 (18:13 +0100)]
js: Centralise piece_set_pos_core
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:03:21 +0000 (18:03 +0100)]
api: Provide Client and ClientSequence to api ops
Some that want to do sophisticated things might want it. I thought
"organise" did but in fact that needs to be done a different way.
Keep this change though; it may come in handy.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 17:34:06 +0000 (18:34 +0100)]
at: Do not any longer tolerate JS errors on game reset
This is all supposed to be sorted now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 19:06:30 +0000 (20:06 +0100)]
at, wdt: Some log formatting improvements
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 19:03:23 +0000 (20:03 +0100)]
wdriver: Put js logs in their own files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 18:42:34 +0000 (19:42 +0100)]
wdriver: Pass DirSubst to JsLogfile::open
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 18:39:46 +0000 (19:39 +0100)]
wdriver: Refactor types surrounding JsLogfile
Nothing substantially changed yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 18:18:14 +0000 (19:18 +0100)]
wdriver: Rename fetch_js_log
This is different to the in-game log.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 11:12:47 +0000 (12:12 +0100)]
wdt: Fix load race (tidy up)
Get rid of the delay-for-testing.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 11:11:53 +0000 (12:11 +0100)]
wdt: Fix load race
With the sleep this fails before, and passes afterwards.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 18:14:36 +0000 (19:14 +0100)]
wdt: Introduce a vpid cache
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 11:53:08 +0000 (12:53 +0100)]
wdt, at: Use vpid mapping everywhere, rather than hardcoded
Races can affect the vpid layout! This fixes flakiness in the tests.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log