add os_GetTokenInput

also fixes bugs in os_GetStringInput

Author: mateoconlechuga

src/ce/getstringinput.src

@@ -1,6 +1,3 @@
-; ---
-; void os_GetStringInput(char *string, char *buf, size_t size)
-; ---
 	assume	adl=1
 
 kUp           := 3
@@ -9,9 +6,11 @@ kDown         := 4
 kEnter        := 5
 kClear        := 9
 kRight        := 1
+kQuit         := $40
+kIns          := $0B
 curLock       := 4
 flags         := $D00080
-curRow        := $D00595
+curRow        := $D00595		; also includes curCol
 curUnder      := $D00599
 _PutS         := $207C0
 _PutC         := $207B8
@@ -23,120 +22,174 @@ _PullDownChk  := $208BC
 _ConvKeyToTok := $20E40
 _GetTokString := $20874
 _PutTokString := $20D74
+_ClrTxtShd    := $20818
 
 	section	.text
 	public	_os_GetStringInput
 _os_GetStringInput:
 	push	ix
 	ld	ix,0
 	add	ix,sp
+	push	ix
+	ld	iy,flags
+	ld	a,(iy + $0d)
+	ld	(.smc.text_flag_0),a
+	ld	a,(iy + $4c)
+	ld	(.smc.text_flag_1),a
+	set	1,(iy + $0d)		; use text buffer
+	res	5,(iy + $4c)		; use text buffer
+	call	_ClrTxtShd
+	pop	ix
 	ld	hl,(ix+6)		; hl -> input string prompt
 	add	hl,de
 	xor	a,a
 	sbc	hl,de
-	jr	z,__nodisp
 	ld	iy,flags
-	call	_PutS
-__nodisp:
+	call	nz,_PutS
 	ld	hl,(curRow)
-	ld	(__savecur),hl
-	ld	a,(ix+12)
-	dec	a
-	ld	(ix+12),a
-	ld	(ix+6),a
-__start:
-	ld	de,(ix+9)
-	jr	__loop
-__skiploop:
+	ld	(.smc.curRow),hl
+	ld	hl,(ix+12)
+	add	hl,de
+	xor	a,a
+	sbc	hl,de
+	jr	nz,.not_empty
 	pop	ix
-	pop	de
-__loop:
-	ld	a,' '
-	ld	(curUnder),a
-	push	de
+	ret
+.not_empty:
+	dec	hl			; subtract 1 for null pointer
+	ld	(ix+12),hl
+	ld	(ix+6),hl		; save initial size
+.start:
+	ld	hl,(ix+6)		; restore initial size
+	ld	(ix+12),hl
+	or	a,a
+	sbc	hl,hl
+	ld	(.smc.str_len),hl
+.loop:
+	ld	iy,flags
 	push	ix
 	call	_CursorOn
-__getkey:
+.getkey:
 	call	_GetKey
 	call	_CursorOff
 	call	_PullDownChk
+	push	af
 	call	_CursorOn
-	jr	c,__getkey
+	pop	af
+	jr	c,.getkey
+	pop	ix
+	cp	a,kQuit
+	jp	z,.done
 	cp	a,kLeft
-	jr	z,__skiploop
+	jr	z,.loop
 	cp	a,kDown
-	jr	z,__skiploop
+	jr	z,.loop
 	cp	a,kRight
-	jr	z,__skiploop
+	jr	z,.loop
 	cp	a,kUp
-	jr	z,__skiploop
+	jr	z,.loop
 	cp	a,kClear
-	jr	z,__clearpop
+	jp	z,.clear
 	cp	a,kEnter
-	jr	z,__done
+	jp	z,.done
+	cp	a,kIns
+	jr	z,.loop
+	ld	de,(ix+9)
+	ld	hl,(.smc.str_len)
+	add	hl,de
+	push	hl			; save buf pointer
+	push	ix
+	cp	a,$F3			; for lists? idk something is wrong with _PullDownChk
+	jr	z,.sub_key
+	cp	a,$F4
+	jr	z,.sub_key
+	cp	a,$F5
+	jr	z,.sub_key
+	cp	a,$F6
+	jr	z,.sub_key
+	cp	a,$F7
+	jr	z,.sub_key
+	cp	a,$F8
+	jr	z,.sub_key
+	cp	a,$F9
+	jr	z,.sub_key
+	cp	a,$FA
+	jr	z,.sub_key
+	cp	a,$FB
+	jr	z,.sub_key
+	jr	.conv_key
+.sub_key:
+	sub	a,$7C
+	ld	($0D0058E),a
+	ld	a,$FE
+.conv_key:
 	call	_ConvKeyToTok
 	call	_GetTokString
 	pop	ix
-	pop	de
-	ld	b,(hl)
+	pop	de			; restore buf pointer
+	ld	b,(hl)			; token string length
 	inc	hl
-	ld	a,(ix+12)
-	sub	a,b
-	jr	nc,__notfull
-	ld	b,(ix+12)
+.draw_string:
+	push	hl
+	ld	hl,(ix+12)
+	add	hl,de
 	xor	a,a
-__notfull:
-	ld	(ix+12),a
-__draw:
+	sbc	hl,de			; check if done
+	dec	hl
+	ld	(ix+12),hl
+	pop	hl
+	jr	z,.full
+	push	hl
+	ld	hl,(.smc.str_len)
+	inc	hl
+	ld	(.smc.str_len),hl
+	pop	hl
 	ld	a,(hl)
 	ld	(de),a
 	inc	hl
 	inc	de
 	call	_PutC
-	djnz	__draw
-	ld	a,(ix+12)
-	or	a,a
-	jr	nz,__loop
-__full:
-	ld	a,' '
-	ld	(curUnder),a
-	push 	de
+	djnz	.draw_string
+	jp	.loop
+.full:
+	push	ix
 	call	_GetKey
-	pop	de
-	cp	a,kClear
-	jr	z,__clear
-	cp	a,kEnter
-	jr	z,__exit
-	jr	__full
-__clearpop:
 	pop	ix
-	pop	de
-__clear:
-__savecur := $+1
+	cp	a,kEnter
+	jr	z,.done
+	cp	a,kClear
+	jr	nz,.full
+.clear:
+.smc.curRow := $+1
 	ld	hl,0
 	ld	(curRow),hl
-	ld	a,(ix+6)
-	ld	b,(ix+12)
-	ld	(ix+12),a
-	sub	a,b
-	ld	b,a
-	inc	b
-__clearloop:
+	ld	hl,(.smc.str_len)
+	inc	hl
+.clear_loop:
+	push	hl
 	ld	a,' '
 	call	_PutC
-	djnz	__clearloop
-	ld	hl,(__savecur)
+	pop	hl
+	ld	bc,1
+	or	a,a
+	sbc	hl,bc
+	jr	nz,.clear_loop
+	ld	hl,(.smc.curRow)
 	ld	(curRow),hl
-	jp	__start
-__done:
-	pop	ix
-	pop	de
-__exit:
-	ld	a,' '
-	ld	(curUnder),a
-	xor	a,a
-	ld	(de),a
+	jp	.start
+.done:
+	call	_ClrTxtShd
 	call	_CursorOff
-	di
+.smc.text_flag_0 := $+1
+	ld	a,0
+	ld	(iy + $0d),a
+.smc.text_flag_1 := $+1
+	ld	a,0
+	ld	(iy + $4c),a
+	ld	de,(ix+9)
+.smc.str_len := $+1
+	ld	hl,0
+	add	hl,de
+	ld	(hl),0
 	pop	ix
 	ret