Changed input_str to just return 0 in length if ESC pressed

Author: JimmyDansbo

README.md

@@ -375,12 +375,12 @@ Preparatory routines: gotoxy (optional)<br>
 Registers affected: .A & .Y<br>
 ZP registers affected: r1 ($04-05)<br>
 
-**Description** Show a cursor and get input from keyboard. The routine supports characters in the range $20-$5F and backspace. Input is written to screen and stored in the buffer at r0. The function does not return until enter/return or ESC is pressed. At that time the buffer will contain the entered string as PETSCII, .Y will contain the actual length of the input string and .A will contain the last key pressed.
+**Description** Show a cursor and get input from keyboard. The routine supports characters in the range $20-$5F and backspace. Input is written to screen and stored in the buffer at r0. The function does not return until enter/return or ESC is pressed. At that time the buffer will contain the entered string as PETSCII, .Y will contain the actual length of the input string or 0 if ESC was pressed.
 
 |Registers | Purpose               |
 |------|-----------------------|
 |  .X  | bg-/fg-color |
-|  .Y  | maximum length of string / Actual length on return |
+|  .Y  | maximum length of string / Actual length or 0 on return |
 |  r0  | Pointer to pre-allocated buffer |
 
 ## Function name: fill_box

vtuilib-cc65.h

@@ -89,6 +89,6 @@ extern void	__fastcall__ vtui_rest_rect(unsigned srcaddr, char srcram, char widt
 // maxlen is the maximum length allowed for the string.
 // Typed characters will have 'color'
 // High-byte = last key pressed (ENTER or ESC), low-byte = actual length
-extern unsigned	__fastcall__ vtui_input_str(char *str, char maxlen, char color);
+extern char	__fastcall__ vtui_input_str(char *str, char maxlen, char color);
 
-#endif
+#endif

vtuilib-generic.asm

@@ -729,8 +729,7 @@ vtui_rest_rect:
 ; INPUTS:	r0 = pointer to buffer to hold string (must be pre-allocated)
 ;		.Y = maximum length of string
 ;		.X = color information for input characters
-; OUPUTS:	.Y = actual length of input
-;		.A = last key pressed (RETURN or ESC)
+; OUPUTS:	.Y = actual length of input (0 if user pressed ESC)
 ; USES:		r1l
 ; *****************************************************************************
 vtui_input_str:
@@ -757,9 +756,11 @@ vtui_input_str:
 	beq	@inputloop
 	cmp	#$0D		; If RETURN has been pressed, we exit
 	beq	@end
-	cmp	#$1B		; If ESC has been pressed, we exit
-	beq	@end
-	cmp	#$14		; We need to handle backspace
+	cmp	#$1B		; If ESC has been pressed,
+	bne	+
+	ldy	#0		; we set length to 0 and exit
+	bra	@end
++	cmp	#$14		; We need to handle backspace
 	bne	@istext
 	cpy	#0		; If .Y is 0, we can not delete
 	beq	@inputloop
@@ -802,10 +803,9 @@ vtui_input_str:
 	iny			; Inc .Y to show a char has been added
 	bra	@inputloop
 
-@end:	pha
+@end:
 	lda	#' '
 	sta	VERA_DATA0
-	pla
 	rts
 
 ; *****************************************************************************