From 458228fb7bbe7758aab5494c944d4501bd108e32 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Mon, 26 Aug 2024 14:02:34 -0700
Subject: [PATCH] (m291) Hooked up skip-forward button

---
 gui/m291/src/m291.tal | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/gui/m291/src/m291.tal b/gui/m291/src/m291.tal
index 6961e5f..2a0882d 100644
--- a/gui/m291/src/m291.tal
+++ b/gui/m291/src/m291.tal
@@ -17,7 +17,7 @@
 |000
 
 	@misc $1
-	@selection $1 &mod $1
+	@selection $1 &mod $1 &track $1
 	@path $2 &null $80
 	@lines &folders $1 &tracks $1 &misc $1
 	@playing $1
@@ -87,7 +87,7 @@
 		BRK }
 	#01 GTH .selection/mod STZ
 	<pick>
-	<lock-mouse>
+	;on-mouse-locked .Mouse/vector DEO2
 	BRK
 
 	&status-bar ( y* -> )
@@ -102,11 +102,11 @@
 	&controls ( y* -> )
 	POP2 .Mouse/x DEI2 #0010 SUB2 #05 SFT2 NIP
 	( > ) DUP #02 NEQ ?{ <skip-prev>
-		<lock-mouse> }
+		;on-mouse-locked .Mouse/vector DEO2 }
 	( > ) DUP #03 NEQ ?{ <send-pause>
-		<lock-mouse> }
+		;on-mouse-locked .Mouse/vector DEO2 }
 	( > ) #04 NEQ ?{ <skip-next>
-		<lock-mouse> }
+		;on-mouse-locked .Mouse/vector DEO2 }
 	BRK
 
 	&seeker ( -> )
@@ -130,10 +130,6 @@
 	( A ) DUP #01 NEQ ?{ .selection LDZ <pick> }
 	POP BRK
 
-@<lock-mouse> ( -- )
-	;on-mouse-locked .Mouse/vector DEO2
-	JMP2r
-
 (
 @|message )
 
@@ -162,18 +158,6 @@
 	STA
 	JMP2r
 
-(
-@|timestamp )
-
-@calc-width ( total* curr* -- width* )
-	STH2
-	DUP2 #011b LTH2 ?{
-		&scale ( -- )
-		DUP2 #0237 LTH2 ?{
-			#01 SFT2 LITr 01 SFT2r !&scale }
-		INC2 #01 SFT2 INC2r LITr 01 SFT2r }
-	[ LIT2r 00e7 ] MUL2r STH2r SWP2 DIV2 JMP2r
-
 (
 @|controls )
 
@@ -181,7 +165,7 @@
 	JMP2r
 
 @<skip-next> ( -- )
-	JMP2r
+	.selection/track LDZ INC .lines/tracks LDZ DIVk MUL SUB !<pick>/tracks
 
 @<seek> ( x* -- )
 	<phex>
@@ -315,6 +299,7 @@
 	POP JMP2r
 
 	&tracks ( id -- )
+	DUP .selection/track STZ
 	#00 SWP
 	( CELLSIZE ) #60 SFT2 ;mem/tracks ADD2 !<send-load>
 
@@ -382,6 +367,15 @@
 @is-mp3 ( line* -- line*f )
 	DUP2 lcap/ #0003 SUB2 ;dict/mp3-ext !scmp3
 
+@calc-width ( total* curr* -- width* )
+	STH2
+	DUP2 #011b LTH2 ?{
+		&scale ( -- )
+		DUP2 #0237 LTH2 ?{
+			#01 SFT2 LITr 01 SFT2r !&scale }
+		INC2 #01 SFT2 INC2r LITr 01 SFT2r }
+	[ LIT2r 00e7 ] MUL2r STH2r SWP2 DIV2 JMP2r
+
 (
 @|id3 )