From 68d8fc725d9c4eb92a54df2f2783b116dcb7ae14 Mon Sep 17 00:00:00 2001
From: d_m <d_m@plastic-idolatry.com>
Date: Sun, 28 Jul 2024 11:23:07 -0400
Subject: [PATCH] click to drag, release to put card down

---
 README.md  |   8 +++++---
 kodiak.rom | Bin 10894 -> 10915 bytes
 kodiak.tal |   9 +++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index cc333ec..e59ef36 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 ## controls
 
  - Use the mouse to move the pointer
- - Click to pick up cards; click again to drop them
+ - Click to pick up cards; release to drop them
  - Press *Esc* to restart the game
  - Press *Return* to print internal game state
 
@@ -46,8 +46,10 @@ $ uxnemu kodiak.rom
 
 **Is dragging cards buggy?**
 
-You don't need to hold down the mouse button when dragging a card.
-Just click once to pick up and click again to release.
+Previous versions of the game had you click once to pick up a card and
+pick up again to release. This doesn't work very well with touch
+screens so it was changed to a more normal click to hold, release to
+drop.
 
 **Is this harder than other solitaire games?**
 
diff --git a/kodiak.rom b/kodiak.rom
index 8a5f340e6d8cc8639f5e692e40f1c021b02cdd89..de5ff3fc9b3492ddd4ba5c49182f0d8d249d4c24 100644
GIT binary patch
delta 564
zcmXw#&1(};6vf}mo0&|;iKbX5l!j!QkHJ<kRZ}vynmiQI?i4BL%1abnI1mtuy1P^@
zf*2zYx^Ok>x>kt@uJk`BE<!D+2nwxklx&RJ<oTkwIUFwcTz=;^<{r;A^Yq^RLWQnB
zyQtH|GLWZ04WJz8WzHONomS}q@sg(Lm)2WapoKRE?gaKo8$qIl#GDRE-VY3r>zF*K
zyi#DxBFhfbpW-|l9qs^0aHAdJdJn59AdDL|(O~&#9Eb$n6ff8eO^OaXU21{+R0O$E
z#P+0i$0fVI;Y9gT9e0<T(C^ca#JtAkMz&VtS_27s$<R)UtJ>s@y#x1_@fa490WLZC
zK7lfwLYi_34Ir}Mk`aikx+D&4k4vJshC1JR0J6#DS+S|5wQ(-@2}_sy<|=G`7u${F
z2`76LY0yMs+UiDcQCu)Qs}mA}?fv}Mnh?eZ+7(x#w`pDcjy^eavi|QGDZj2k|21@1
zR6HB0A^D3W(~9ap60RlO-mL)0Hc&JR4!#>wTQ?kxo9>V212d}3xcF=qXiiu$?&LyB
z{6WXNARh+k47#Us0%F5zVLmpi^i|B!b0Kkk!L6j5%7u*hzJhY6{gpv-5&B<2-VE*B
yp+R)WI-x@6toez|)REB6Oa)3x9-gXJLVK*_4MrZ)Y9;R>t5zy%FxKi?OPN19rnv$D

delta 559
zcmX9)O-NK>6utMoH*fylye70!bIQjw^AHWjXvC-1%p(wK5&eMcE<@0wk7gB=w76JA
zSjfZ&+475M6H<mNTe)b{%8g<{MNnb%gS4<r%&%u|4u^9&+;h&Ov8l0U5y$V9s`&Ex
zg&1ZZ5X=(VgdyRj&}@;{u!aZZJRZdFbFZ<4r6rqN$b4*dFjxu_Lkfz4ut~q+wxbb`
zkjz<GFpuFUdEV@7eMgWD?FA!@ec@W3zzpqEa>^`PDS|CIZw{j&*Uht)honE2Nw1c9
zxzD=e!M-)_8MxTs?tvz0#1D|T8tT<Ty&hWE8Q5=Ajv>dbJ|n#;XRQ6Bypr{Bnv4k#
zI>=b`AVX%a2XS8EShzJ!dNS1K#1p4DD9R<$zlsggKNYn1?op8KJ)IY%4~4p0#$!76
zd6Bk$$h19@Z7G~!6itSNgM$9DB->A|DF9wR5^gTZru`n*Wg~tYh1`fg9Uf`yZjuig
z7Hu!k#!O@{7<C3gkftckM2_F?1;ICRoJn}UU+s|2h*agDL<wEll?)@KWNXe<2mv1+
z;9I2c3eNrS?8?dH$#yqTun<HIUU+~)fftBET{*7&mdtm#%7h?@f_Ov0vt9r8SJF45
z`=H9Z(oc;>A1<e^^rZTaD<{=2BB=O$rdCysQ}K5spRrag`fS#!)ktvWGU@wW{{Vz3
Bw;BKd

diff --git a/kodiak.tal b/kodiak.tal
index 3bbe619..0ead9ee 100644
--- a/kodiak.tal
+++ b/kodiak.tal
@@ -271,7 +271,7 @@
 @on-mouse ( -> brk )
     on-move
     on-click-down
-(    on-click-up )
+    on-click-up
     .Mouse/state DEI .prev/mouse-state STZ
     BRK
 
@@ -336,7 +336,6 @@
     .Mouse/state DEI             ( state^ )
     .prev/mouse-state LDZ #ff EOR AND ( down^ )
     #01 AND ?&ok JMP2r &ok
-    .dragging LDZ ?release
     maybe-select-stock ?&skip
     maybe-select-waste ?&found
     maybe-select-tableau ?&found
@@ -555,10 +554,12 @@
         POP2 POP POP2r #00 JMP2r      ( 0^ )
 
 
-( @on-click-up ( -> )
+@on-click-up ( -> )
     .Mouse/state DEI #ff EOR    ( not-state^ )
     .prev/mouse-state LDZ AND        ( up^ )
-    #01 AND ?{ JMP2r } JMP2r ( TODO: anything to do here? ) )
+    #01 AND ?&ok JMP2r &ok
+    .dragging LDZ ?release
+    JMP2r
 
 @on-key ( -> brk )
     on-press on-release