From 73c7ab5f6b587320bc22fa1aac0dca7b079ebcb8 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Sat, 26 Apr 2025 02:56:36 +1000
Subject: [PATCH] =?UTF-8?q?+=20K=5FSETUP:=20=D0=B4=D0=B2=D0=B5=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BF=D0=BE=D0=B4=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=BB/=D0=B2=D1=8B=D0=BA=D0=BB=20=D0=BA=D1=83=D1=80=D1=81?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSS/KEYINTER.ASM | 57 +++++++++++++++++++++++++++++++++---------------
 DSS/build.txt    |  2 +-
 Shared_Includes  |  2 +-
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/DSS/KEYINTER.ASM b/DSS/KEYINTER.ASM
index a36feed..f97b49b 100644
--- a/DSS/KEYINTER.ASM
+++ b/DSS/KEYINTER.ASM
@@ -110,22 +110,23 @@ UNCODE		DW	0	; 
 
 
 
-WAITKEY	LD	HL,HOST
-	LD	A,(HEAD)
-	CP	(HL)
-	JR	Z,WAITKEY
-	CALL	GETSYM
-	LD	A,E
-	AND	A
-	RET
+WAITKEY:	LD	HL,HOST
+		LD	A,(HEAD)
+		CP	(HL)
+		JR	Z,WAITKEY
+		CALL	GETSYM
+		LD	A,E
+		AND	A
+		RET
+;
 
-SCANKEY	LD	HL,HOST
-	LD	A,(HEAD)
-	CP	(HL)
-	RET	Z
-	CALL	GETSYM
-	LD	A,E
-	RET
+SCANKEY:	LD	HL,HOST
+		LD	A,(HEAD)
+		CP	(HL)
+		RET	Z
+		CALL	GETSYM
+		LD	A,E
+		RET
 ;
 
 ;
@@ -209,6 +210,7 @@ ECHOKEY:        CALL	Cursor_On	                ; 
                 LD	A,E
                 AND	A
                 RET
+;
 
 Cursor:		;!TODO логичнее курсором моргать и шрифты менять из биоса же?
 .Flag+1:	LD A,0                                  ; флаг курсора 00-нет/01-есть
@@ -219,7 +221,7 @@ Cursor_On:	LD	C,BIOS.LP_GET_PLACE		; узн
 		RST	ToBIOS
 		LD	(Cursor_Off.pos),DE
 		XOR	A
-		LD	C,BIOS.WIN_GET_SYM	        ; получить символ
+		LD	C,BIOS.WIN_GET_SYM		; получить символ
 		RST	ToBIOS
 		;
 		LD	A,%0010'0000
@@ -1011,12 +1013,31 @@ K_SND_R:	DJNZ	K_SND_W
 		AND	A
 		RET
 		;					subfunc 2
-K_SND_W:	;DJNZ	K_RESET_BUFFER	;. [ ] 31/03/2024		subfunc 3 нужна ли?
-		DJNZ	K_SETUP.ERROR
+K_SND_W:	;DJNZ	K_RESET_BUFFER	; [ ] 31/03/2024		subfunc 3 нужна ли?
+		DJNZ	K_CURSOR_ON	; [ ] 26/04/2025 управление видимостью курсора
 		;
 		LD	(SOUND_K),A
 		AND	A
 		RET
+;
+
+		; [ ] 26/04/2025 управление видимостью курсора
+K_CURSOR_ON:	DJNZ	K_CURSOR_OFF
+		LD	A,(VMODE)
+		RLA
+		JP	NC,Cursor_On
+		RET
+;
+
+		; [ ] 26/04/2025 управление видимостью курсора
+K_CURSOR_OFF:	DJNZ	K_SETUP.ERROR
+		LD	A,(VMODE)
+		RLA
+		JP	NC,Cursor_Off
+		RET
+;
+
+
 		;
 ; 		;. [ ] 31/03/2024			subfunc 3 нужна ли?
 ; K_RESET_BUFFER:	DJNZ	K_SETUP.ERROR
diff --git a/DSS/build.txt b/DSS/build.txt
index 597975b..dce6588 100644
--- a/DSS/build.txt
+++ b/DSS/build.txt
@@ -1 +1 @@
-35
\ No newline at end of file
+36
\ No newline at end of file
diff --git a/Shared_Includes b/Shared_Includes
index e0dd54c..a6c50f5 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit e0dd54cb5615a23ea55bd217578aab57481fcf77
+Subproject commit a6c50f572424e88f6199d639fa8109d53b71142c