Commit: bbc568effb50bfc8595c2ce09568596cbad37cdc - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• Revision: bbc568effb50bfc8595c2ce09568596cbad37cdc (tree)
• Time: 2023-06-27 22:28:41
• Author: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

Support input cursor with InputString/InputPassword Mode.

Change Summary

• modified: src/tuicmd.c
• modified: src/tuikey.c
• modified: src/tuikey.h

Incremental Difference

--- a/src/tuicmd.c
+++ b/src/tuicmd.c
@@ -38,6 +38,9 @@ int
 {
 	int		i_mode;
 	int		i_len;
+	int		i_cursor;
+	int		i_start;
+	int		i_row;
 	char	*pstr_input;
 	char	*pstr_prompt;
 	char	str_pass[ HVISOR_SSH_MAXLEN_PASSWORD ];
@@ -46,18 +49,22 @@ int
 
 	pstr_prompt	= TuiKey_GetPromptString();
 
-	mvwprintw( gp_cmd_win, 0, 0, "%s", pstr_prompt );
+	mvwprintw( gp_cmd_win, 0, 0, "%s => ", pstr_prompt );
 
 	i_mode	= TuiKey_GetMode();
 	if( TUIKEY_MODE_INPUTSTR == i_mode )	{
-		pstr_input	= TuiKey_GetInputStringAndPasswd( NULL );
-		wprintw( gp_cmd_win, " => %s", pstr_input );
+		getyx( gp_cmd_win, i_row, i_start );
+
+		pstr_input	= TuiKey_GetInputStringAndPasswd( NULL, &i_cursor );
+		wprintw( gp_cmd_win, "%s", pstr_input );
+
+		wmove( gp_cmd_win, i_row, i_start + i_cursor );
 	}
 	else if( TUIKEY_MODE_INPUTPASSWD == i_mode )	{
-		pstr_input	= TuiKey_GetInputStringAndPasswd( &i_len );
+		pstr_input	= TuiKey_GetInputStringAndPasswd( &i_len, NULL );
 		str_pass[ i_len-- ]	= '\0';
 		for( ; 0 <= i_len; i_len-- )	{ str_pass[ i_len ]	= '*'; }
-		wprintw( gp_cmd_win, " => %s", str_pass );
+		wprintw( gp_cmd_win, "%s", str_pass );
 	}
 
 	touchwin( gp_cmd_win );

--- a/src/tuikey.c
+++ b/src/tuikey.c
@@ -137,7 +137,7 @@ int
 VMTUI_TUIKEY_EXTERN
 char *
 	TuiKey_GetInputStringAndPasswd(
-		int	*pi_len )
+		int	*pi_len, int *pi_cursor )
 {
 	if(( TUIKEY_MODE_INPUTSTR != gi_keymode ) && ( TUIKEY_MODE_INPUTPASSWD != gi_keymode ))	{
 		return NULL;
@@ -146,6 +146,9 @@ char *
 	if( NULL != pi_len )
 		{ *pi_len	= gt_input.i_inputlen; }
 
+	if( NULL != pi_cursor )
+		{ *pi_cursor	= gt_input.i_cursor; }
+
 	return	gt_input.str_input;
 }
 
@@ -161,6 +164,29 @@ char *
 /* ===========================================================================*/
 VMTUI_TUIKEY_EXTERN
 int
+	TuiKey_SetInputModeOption(
+		void	*pv_option )
+{
+	gt_input.pv_option	= pv_option;
+
+	return 0x00;
+}
+
+/* ===========================================================================*/
+VMTUI_TUIKEY_EXTERN
+int
+	TuiKey_ReturnMode(
+		void )
+{
+	TuiKey_SetInputModeOption( NULL );
+	TuiKey_ChangeMode( gt_input.i_retmode, REQUEST_CMD_NONE,
+						0x00, 0x00, NULL, 0x00, TUIKEY_MODE_NONE, NULL );
+	return 0x00;
+}
+
+/* ===========================================================================*/
+VMTUI_TUIKEY_EXTERN
+int
 	TuiKey_ChangeMode(
 		int					i_mode,
 		Byte				b_reqcmd,
@@ -180,6 +206,7 @@ int
 	gt_input.i_retmode		= i_retmode;
 
 	if( TUIKEY_MODE_INPUTSTR == i_mode )	{
+		gt_input.i_cursor		= 0;
 		gt_input.i_inputlen		= 0;
 		gt_input.i_input		= 0;
 		gt_input.str_input[0]	= '\0';
@@ -190,6 +217,7 @@ int
 			{ strncpy( gt_input.str_msg, "Input String", sizeof( gt_input.str_msg ) ); }
 	}
 	else if( TUIKEY_MODE_INPUTPASSWD == i_mode )	{
+		gt_input.i_cursor		= 0;
 		gt_input.i_inputlen		= 0;
 		gt_input.i_input		= 0;
 		gt_input.str_input[0]	= '\0';
@@ -253,12 +281,26 @@ int
 
 	if( ERR == i_key )	{ return i_ret; }
 
+	// Input Character ---
 	if( isprint( i_key ) )	{
-		if( gt_input.i_inputlen < sizeof(gt_input.str_input) - 1)	{
+		if( gt_input.i_inputlen >= sizeof(gt_input.str_input) - 1)	{ return i_ret; }
+
+		if( gt_input.i_cursor == gt_input.i_inputlen )	{
+			gt_input.i_cursor++;
 			gt_input.str_input[gt_input.i_inputlen++]	= (char)i_key;
 			gt_input.str_input[gt_input.i_inputlen]		= '\0';
 		}
+		else	{
+			bcopy( (gt_input.str_input + gt_input.i_cursor),
+					(gt_input.str_input + gt_input.i_cursor + 1),
+					(gt_input.i_inputlen - gt_input.i_cursor + 1) );
+
+			gt_input.i_inputlen++;
+			gt_input.str_input[gt_input.i_cursor]	= (char)i_key;
+		}
 	}
+
+	// Enter ---
 	else if(( KEY_ENTER == i_key) || ( 10 == i_key ))	{
 		if( NULL != gt_input.fp_inputstr )	{
 			gt_input.fp_inputstr( gt_input.i_hvisor, gt_input.i_guest,
@@ -266,16 +308,51 @@ int
 								gt_input.i_inputlen, gt_input.str_input );
 		}
 	}
-	// KEY_ESC
+
+	// KEY_ESC ---
 	else if( 27 == i_key )	{
-		// Return mode ---
-		TuiKey_ChangeMode( gt_input.i_retmode, REQUEST_CMD_NONE,
-							0x00, 0x00, NULL, 0x00, TUIKEY_MODE_NONE, NULL );
+		TuiKey_ReturnMode();
 	}
-	else if( KEY_BACKSPACE == i_key )	{
-		if( 0 < gt_input.i_inputlen )	{
+
+	// BackSpace ---
+	else if(( KEY_BACKSPACE == i_key ) || ( NCURSES_Ctrl('h') == i_key ))	{
+		if( 0 >= gt_input.i_inputlen )	{ return i_ret; }
+
+		if( 0 == gt_input.i_cursor )	{
+			return 0x00;
+		} else if( gt_input.i_cursor == gt_input.i_inputlen )	{
+			gt_input.i_cursor--;
 			gt_input.str_input[--gt_input.i_inputlen]	= '\0';
 		}
+		else	{
+			bcopy( (gt_input.str_input + gt_input.i_cursor),
+					(gt_input.str_input + gt_input.i_cursor - 1),
+					(gt_input.i_inputlen - gt_input.i_cursor + 1) );
+			gt_input.i_cursor--;
+			gt_input.i_inputlen--;
+		}
+	}
+
+	// Clear ---
+	else if( NCURSES_Ctrl('l') == i_key )	{
+		gt_input.i_cursor		= 0;
+		gt_input.i_inputlen		= 0;
+		gt_input.i_input		= 0;
+		gt_input.str_input[0]	= '\0';
+	}
+
+	// Move Cursor ---
+	else if(( KEY_LEFT == i_key ) || ( NCURSES_Ctrl('b') == i_key ))	{
+		if( 0 < gt_input.i_cursor )	{ gt_input.i_cursor--; }
+	}
+	else if(( KEY_RIGHT == i_key ) || ( NCURSES_Ctrl('f') == i_key ))	{
+		if( gt_input.i_cursor < gt_input.i_inputlen )	{ gt_input.i_cursor++; }
+	}
+	else if( NCURSES_Ctrl('a') == i_key )	{
+		gt_input.i_cursor	= 0;
+	}
+	else if( NCURSES_Ctrl('e') == i_key )	{
+		gt_input.i_cursor	= gt_input.i_inputlen;
 	}
 
 	return i_ret;
@@ -297,9 +374,7 @@ int
 			{ i_ret	= 0x01; }
 	}
 
-	// Return mode ---
-	TuiKey_ChangeMode( gt_input.i_retmode, REQUEST_CMD_NONE,
-						0x00, 0x00, NULL, 0x00, TUIKEY_MODE_NONE, NULL );
+	TuiKey_ReturnMode();
 
 	return i_ret;
 }

--- a/src/tuikey.h
+++ b/src/tuikey.h
@@ -42,8 +42,10 @@ VMTUI_TUIKEY_EXTERN int TuiKey_TestCode( void );
 VMTUI_TUIKEY_EXTERN char *TuiKey_GetKeyName( char *pstr_buf, int i_len, int i_key );
 VMTUI_TUIKEY_EXTERN int TuiKey_ChangeInfoWindow( int i_direction );
 VMTUI_TUIKEY_EXTERN int TuiKey_GetMode( void );
-VMTUI_TUIKEY_EXTERN char *TuiKey_GetInputStringAndPasswd( int *pi_len );
+VMTUI_TUIKEY_EXTERN char *TuiKey_GetInputStringAndPasswd( int *pi_len, int *pi_cursor );
 VMTUI_TUIKEY_EXTERN char *TuiKey_GetPromptString( void );
+VMTUI_TUIKEY_EXTERN int TuiKey_SetInputModeOption( void *pv_option );
+VMTUI_TUIKEY_EXTERN int TuiKey_ReturnMode( void );
 VMTUI_TUIKEY_EXTERN int TuiKey_ChangeMode(
 							int i_mode, Byte b_reqcmd, int i_hvisor, int i_guest,
 							InputStrFunction fp_handler, Byte b_option, int i_retmode, char *pstr_msg );
@@ -88,14 +90,17 @@ typedef	struct	{
 	int		i_guest;
 	Byte	b_option;
 
+	int		i_cursor;
+
 	int		i_retmode;
 	InputStrFunction	fp_inputstr;
 
 	int		i_inputlen;
 	int		i_input;
 	char	str_input[512];
-	char	str_option[512];
+	//char	str_option[512];
 	char	str_msg[128];
+	void	*pv_option;
 } TuiKey_InputLine;
 
 #ifdef VMTUI_SRC_TUIKEY