Kernel 0.94

INC/IO.D2.I.txt

@@ -3,7 +3,7 @@ NEW
 *--------------------------------------
 IO.D2.SeekTimeR	.EQ 160					LIBBLKDEV Recalibration
 IO.D2.SeekTimeF	.EQ 140					LIBBLKDEV Track Formatter
-IO.D2.SeekTimeB	.EQ 95					LIBBLKDEV Boot Block
+IO.D2.SeekTimeB	.EQ 140					LIBBLKDEV Boot Block
 IO.D2.SeekTimeP	.EQ 75					ProDOS.FX initial
 IO.D2.SeekTimeI	.EQ 20					ProDOS.FX increment -> until > 128
 *--------------------------------------

LIB/LIBBLKDEV.S.BB.txt

@@ -388,16 +388,19 @@ BB.PhasesOff	bit IO.D2.Ph0Off,x
 *--------------------------------------
 BB.Wait			phx						(3)
 
-.1				ldx #18					(2)
+.1				ldx #17					(2)
 
 .2 				dex 					(2) 	delay 86 usec.
-				bne .2					(2+)	2 + 5x16 + 2 + 2
+				bne .2					(2+)	2 + 5x17 + 2 + 2
 
 				ldx BB.Slotn0			(3)
 				bit IO.D2.DrvOn,x		(4) Slow down ACC boards
 
-				sec						(2)
-				sbc #1	 				(2)
+*				sec						(2)
+*				sbc #1	 				(2)
+
+				dec						(2)
+
 				bne .1					(2+)
 				
 				plx						(4)
@@ -425,7 +428,7 @@ tryread 		plp 					fix stack.
 
 rdhead 			sec 					anticipate error.
 				inc BB.RetryCnt			if = 0 then give up!
-				bmi BB.Trk2Qtrk.RTS		branch if can't fine/read sector.
+				beq BB.Trk2Qtrk.RTS		branch if can't fine/read sector.
 
 				clc 					indicate reading header.
 
@@ -433,7 +436,7 @@ rdhead 			sec 					anticipate error.
 				
 rddata 			php 					carry set if reading sector.
 
-rd0 			dey 					every time y=0 decrement find count.
+rd0 			iny
 				beq tryread
 *--------------------------------------
 * from zzstart to zzend code is moved from rom and modified to match this code...

LIB/LIBGUI.S.DRAW.txt

@@ -265,13 +265,11 @@ DrawLine.IncX	lda DX
 				
 .8				rts
 *--------------------------------------
-* drawtext (short int OP, short int hFONT, int X1, int Y1)
+* drawbitmap (short int OP, S.BM *bitmap, int X1, int Y1)
 *--------------------------------------
-DrawText		clc
+DrawBitMap		clc
 				rts
 *--------------------------------------
-* 
-*--------------------------------------
 DRAW.YABMAtDXDY	>STYA ZPBMPtr			Src BM
 
 				lda #S.CB.CMD.BITBLT
@@ -308,6 +306,11 @@ DRAW.YABMAtDXDY	>STYA ZPBMPtr			Src BM
 
 				jmp PutCBCache2CBBuf
 *--------------------------------------
+* drawtext (short int OP, short int hFONT, int X1, int Y1)
+*--------------------------------------
+DrawText		clc
+				rts
+*--------------------------------------
 DRAW.YATextAtDXDY	
 				phx
 				jsr CB.ClearCache

LIB/LIBGUI.S.MENU.txt

@@ -214,9 +214,7 @@ MENU.SetMItemProp
 				sta (ZPPtr1),y
 
 .8				>RET 3
-* ----------------------------------------------
-* |Icon ChkMrk "Menu Item" KEYMOD1-KEYMOD2-KEY>|
-* ----------------------------------------------
+*--------------------------------------
 MENU.Show		>SYSCALL2 GetMemPtr
 				>STYA ZPMENUPtr
 				
@@ -260,12 +258,12 @@ MENU.Enter		jsr MENU.GetDX
 				jsr MENU.GetMItems
 				
 .1				lda (ZPPtr1)
-				beq .9
+				beq .8
 
 				ldy #S.MITEM.F
 				lda (ZPPtr1),y
 				cmp #S.MITEM.F.SEP
-				beq .7
+				beq .2
 				
 				lda DY
 				sec
@@ -277,34 +275,74 @@ MENU.Enter		jsr MENU.GetDX
 
 				>LDYAI DX 
 				jsr MOU.InRectYA
-				bcs .7
+				bcc .3
 				
-				ldy #S.MENU.Selected
+.2				jsr MENU.NextMItem
+				bra .1
+				
+.3				ldy #S.MENU.Selected
 				lda (ZPMENUPtr),y
-				pha
 				
 				ldy #S.MITEM.ID
-				lda (ZPPtr1),y
-				
+				cmp (ZPPtr1),y
+				beq .9					same a s before, nothing to do
+
+				pha						old one
+
+				lda (ZPPtr1),y			new one
 				ldy #S.MENU.Selected
 				sta (ZPMENUPtr),y
 				
 				jsr GetCBBuf
-				jsr MENU.ShowMItem1
 				
 				plx
-				beq .6
-				
-				jsr MENU.FindMItemByID
-				bcs .6
+				beq .4					no previous selection
 				
+				jsr MENU.FindMItemByID	deselect previous...
+				jsr MENU.GetDX
 				jsr MENU.ShowMItem1
 				
-.6				>LDYA L.WND.Screen
-				jmp DrawCBPtrToYA1
+.4				ldy #S.MENU.Selected	select new one
+				lda (ZPMENUPtr),y
+				tax
 				
-.7				jsr MENU.NextMItem
-				bra .1
+				jsr .80					go update it
+				
+				ldy #S.MENU.Selected
+				lda (ZPMENUPtr),y
+				tax
+				jsr MENU.FindMItemByID
+
+				ldy #S.MITEM.F
+				lda (ZPPtr1),y
+				cmp #S.MITEM.F.SUBMENU
+				bne .9
+				
+				
+				
+				
+				
+				
+				
+				rts
+			
+.8				ldy #S.MENU.Selected	nothing to select....
+				lda (ZPMENUPtr),y
+				beq .9					....and nothing to deselect
+
+				pha
+				lda #0
+				sta (ZPMENUPtr),y
+
+				jsr GetCBBuf
+				
+				plx
+
+.80				jsr MENU.FindMItemByID
+				jsr MENU.GetDX
+				jsr MENU.ShowMItem1
+				>LDYA L.WND.Screen
+				jmp DrawCBPtrToYA1
 				
 .9				rts
 *--------------------------------------
@@ -563,13 +601,9 @@ MENU.ShowMItem1	lda #S.CB.CMD.FILLRECT
 				lda #S.CB.M.MONO
 				sta CB.Cache+S.CB.M
 				
-				ldy #S.MENU.Selected
-				lda (ZPMENUPtr),y
-
 				ldx PREFS.MENUCOLOR
-				ldy #S.MITEM.ID
-				eor (ZPPtr1),y
-				bne .15
+				jsr MENU.IsSelected
+				bcc .15
 				
 				txa
 				eor #C.WHITE
@@ -631,6 +665,7 @@ MENU.ShowMItem1	lda #S.CB.CMD.FILLRECT
 				
 .21				jsr MENU.GetText
 
+				jsr MENU.IsSelected
 				ldx hSYSFON
 				jsr DRAW.YATextAtDXDY
 
@@ -647,6 +682,7 @@ MENU.ShowMItem1	lda #S.CB.CMD.FILLRECT
 				jsr MENU.GetKeyString
 				beq .3
 
+				jsr MENU.IsSelected
 				ldx hSYSFON
 				jsr DRAW.YATextAtDXDY
 				
@@ -698,6 +734,23 @@ MENU.GetIcon	ldy #S.MITEM.pICON+1
 				
 				rts				
 *--------------------------------------
+MENU.IsSelected	phy
+				pha
+				
+				ldy #S.MENU.Selected
+				lda (ZPMENUPtr),y
+
+				ldx PREFS.MENUCOLOR
+				ldy #S.MITEM.ID
+				cmp (ZPPtr1),y
+				beq .9
+				
+				clc
+				
+.9				pla
+				ply
+				rts
+*--------------------------------------
 MENU.GetText	lda #S.MITEM.TEXT
 				clc
 				adc ZPPtr1
@@ -862,7 +915,6 @@ MENU.GetDYW		ldy #S.OBJ.Y1
 *--------------------------------------
 MENU.FindMItemByID
 				jsr MENU.GetMItems
-				jsr MENU.GetDX
 				jsr MENU.GetDYW
 				
 .1				lda (ZPPtr1)