Fixed mode switching logic, disable control key operation (like page mode) during editing

Author: lennart-benschop

mos/nano.bin

@@ -2,7 +2,7 @@
 ; Title:	AGON MOS - API for user projects
 ; Author:	Dean Belfield
 ; Created:	03/08/2022
-; Last Updated:	15/04/2023
+; Last Updated:	11/11/2023
 ;
 ; Modinfo:
 ; 05/08/2022:	Added mos_feof
@@ -20,8 +20,12 @@
 ; 29/03/2023:	Added mos_uopen, mos_uclose, mos_ugetc, mos_uputc
 ; 13/04/2023:	Added FatFS file structures (FFOBJID, FIL, DIR, FILINFO)
 ; 15/04/2023:	Added mos_getfil, mos_fread, mos_fwrite and mos_flseek
-; Changed:      08/04/2924 adapt to ez80asm
-
+; 19/05/2023:	Added sysvar_scrMode
+; 05/06/2023:	Added sysvar_rtcEnable
+; 03/08/2023:	Added mos_setkbvector
+; 10/08/2023:	Added mos_getkbmap
+; 11/11/2023:	Added mos_i2c_open, mos_i2c_close, mos_i2c_write and mos_i2c_read
+; 09/04/2024:   Adapter to ez80asm
 ; VDP control (VDU 23, 0, n)
 ;
 vdp_gp:			EQU 	80h
@@ -67,6 +71,13 @@ mos_getfil:		EQU	19h
 mos_fread:		EQU	1Ah
 mos_fwrite:		EQU	1Bh
 mos_flseek:		EQU	1Ch
+mos_setkbvector:	EQU	1Dh
+mos_getkbmap:		EQU	1Eh
+mos_i2c_open:		EQU	1Fh
+mos_i2c_close:		EQU	20h
+mos_i2c_write:		EQU	21h
+mos_i2c_read:		EQU	22h
+
 
 ; FatFS file access functions
 ;
@@ -150,10 +161,19 @@ sysvar_scrpixelIndex:	EQU	16h	; 1: Index of pixel data read from screen
 sysvar_vkeycode:	EQU	17h	; 1: Virtual key code from FabGL
 sysvar_vkeydown:	EQU	18h	; 1: Virtual key state from FabGL (0=up, 1=down)
 sysvar_vkeycount:	EQU	19h	; 1: Incremented every time a key packet is received
-sysvar_rtc:		EQU	1Ah	; 8: Real time clock data
+sysvar_rtc:		EQU	1Ah	; 6: Real time clock data
+sysvar_spare:		EQU	20h	; 2: Spare, previously used by rtc
 sysvar_keydelay:	EQU	22h	; 2: Keyboard repeat delay
 sysvar_keyrate:		EQU	24h	; 2: Keyboard repeat reat
 sysvar_keyled:		EQU	26h	; 1: Keyboard LED status
+sysvar_scrMode:		EQU	27h	; 1: Screen mode
+sysvar_rtcEnable:	EQU	28h	; 1: RTC enable flag (0: disabled, 1: use ESP32 RTC)
+sysvar_mouseX:		EQU	29h	; 2: Mouse X position
+sysvar_mouseY:		EQU	2Bh	; 2: Mouse Y position
+sysvar_mouseButtons:	EQU	2Dh	; 1: Mouse button state
+sysvar_mouseWheel:	EQU	2Eh	; 1: Mouse wheel delta
+sysvar_mouseXDelta:	EQU	2Fh	; 2: Mouse X delta
+sysvar_mouseYDelta:	EQU	31h	; 2: Mouse Y delta
 	
 ; Flags for the VPD protocol
 ;
@@ -163,6 +183,8 @@ vdp_pflag_point:	EQU	00000100b
 vdp_pflag_audio:	EQU	00001000b
 vdp_pflag_mode:		EQU	00010000b
 vdp_pflag_rtc:		EQU	00100000b
+vdp_pflag_mouse:	EQU	01000000b
+; vdp_pflag_buffered:	EQU	10000000b
 
 ;
 ; FatFS structures

mos_api.inc

@@ -940,7 +940,7 @@ Show_Status:			; Show status line at bottom of screen
 			RST.LIL 10h
 			LD	HL, (num_lines)
 			CALL	Print_Decimal
-			LD 	A, $2c ; Commaa
+			LD 	A, ','
 			RST.LIL 10h
 			LD 	A, ' '
 			RST.LIL 10h			
@@ -1944,7 +1944,8 @@ s_LINETOOLONG:		DB	"Line too long!",0
 s_NOMEM:		DB	"Buffer full!",0
 ; RAM variables
 
-Saved_Rows:		DS	1		; Rows of video mode in which editor started, so we can return to that mode.	
+Saved_Mode:		DS	1		; video mode in which editor started, so we can return to that mode.
+Current_Mode:           DS      1               ; Current video mode.
 Current_Rows:		DS 	1		; Number of rows in current video mode
 Current_Cols:		DS	1		; Number of columns in current video mode.
 filename:		DS 	256		; Name of file being edited.		

nano.asm

@@ -83,21 +83,26 @@ True_Video:		LD 	HL, c_TRUEVID
 
 ; Put VDU in 80 column mode, of not already there.
 Setup_Screen:		PUSH 	IX
+			LD 	HL, c_FIXSETTINGS
+			CALL	Print_CString		; Cancel text window control keys, page mode	
 			MOSCALL mos_sysvars
 			RES 	4, (IX+sysvar_vpd_pflags)	; Clear mode flag
 			LD 	HL, c_GETMODE
 			CALL	Print_CString  		; Get screen mode parameters.
 @@:			BIT	4, (IX+sysvar_vpd_pflags)			
 			JR 	Z, @B		        ; Wait until received.	
-			LD	A, (IX+sysvar_scrRows)
-			LD	(Saved_Rows),A
+			LD	A, (IX+sysvar_scrMode)
+			LD	(Saved_Mode),A
 			LD	A, (IX+sysvar_scrCols)
 			CP	80
-			JR	NC, Setup_End		; Apparently mode 3 or 0, do not switch
+			JR	NC, Setup_End		; We have a mode with at least 80 columns, keep that.
 			LD	A, 22
 			RST.LIL 10h
 			LD	A, 3
-			RST.LIL 10h			; Enter Mode 3
+			RST.LIL 10h			; Enter Mode 3 (80x30)
+			LD	A,(IX+0)
+@@:			CP	(IX+0)
+			JR	Z, @B			; Wait for VBLANK
 Setup_End:		RES 	4, (IX+sysvar_vpd_pflags)	; Clear mode flag
 			LD 	HL, c_GETMODE
 			CALL	Print_CString  		; Get screen mode parameters.
@@ -106,24 +111,22 @@ Setup_End:		RES 	4, (IX+sysvar_vpd_pflags)	; Clear mode flag
 			LD	A, (IX+sysvar_scrRows)
 			LD	(Current_Rows),A
 			LD	A, (IX+sysvar_scrCols)
-			LD	(Current_Cols),A			
+			LD	(Current_Cols),A
+			LD 	A, (IX+sysvar_scrMode)
+			LD      (Current_Mode),A
 			POP	IX
 			RET
 			
 ; Restore original video mode.
-Restore_Screen:		LD	A, (Saved_Rows)
-			CP	60
-			RET	Z			; Do nothing if we were already in mode 0
-			CP	25
-			JR 	NZ, @F
-			LD	L, 2
-			JR	Restore1
-@@:			CP	48
-			JR	NZ, @F
-			LD	L, 1
-			JR	Restore1
-@@:			RET				; We do not know about other modes, so please return.
-Restore1:		LD	A, 22
+Restore_Screen:	   	LD 	HL, c_ENABLECTRL        ; Re-enable control keys
+			CALL	Print_CString
+
+			LD	A, (Saved_Mode)
+			LD      L, A
+			LD 	A, (Current_Mode)
+			CP      L
+			RET	Z			; Do nothing if we had not changed modes.
+			LD 	A, 22
 			RST.LIL 10h
 			LD 	A, L
 			RST.LIL 10h
@@ -170,6 +173,8 @@ c_INVVID:		DB	4
 c_TRUEVID:		DB	4
 			DB	17, 15		; Foreground white
 			DB	17, 128		; Background black
-c_GETMODE:  		DB	5, 15,26,23,0,vdp_mode		; Get screen mode parameters. Switch off paged mode, cancels text window.			
+c_FIXSETTINGS:		DB	6, 23,0,$98,0,15,26 ; Switch off control keys, cancel page mode, text window.
+c_ENABLECTRL:		DB	4, 23,0,$98,1       ; Switch on control keys    
+c_GETMODE:  		DB	3, 23,0,vdp_mode		; Get screen mode parameters. Switch off paged mode, cancels text window.			
 ; RAM
 ;