Commit: cb903de6fbb0111465ff90abc1021753fe11ed9f - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• Révision: cb903de6fbb0111465ff90abc1021753fe11ed9f (tree)
• l'heure: 2023-06-29 22:22:58
• Auteur: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Message de Log

Implement Int/SfxInt/IPaddr. Input mode.

Change Summary

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

Modification

--- a/src/tuikey.c
+++ b/src/tuikey.c
@@ -209,13 +209,26 @@ int
 	gt_input.fp_inputstr	= fp_handler;
 	gt_input.i_retmode		= i_retmode;
 
-	if( TUIKEY_MODE_INPUTSTR == i_mode )	{
+	if( TUIKEY_MODE_INPUTSTR & ((DWord)i_mode) )	{
 		gt_input.i_cursor		= 0;
 		gt_input.b_option		= b_option;
 		if( NULL != pstr_msg )
 			{ strncpy( gt_input.str_msg, pstr_msg, sizeof( gt_input.str_msg ) ); }
-		else
-			{ strncpy( gt_input.str_msg, "Input String", sizeof( gt_input.str_msg ) ); }
+		else	{
+			if( TUIKEY_MODE_INPUTINT == i_mode )
+				{ strncpy( gt_input.str_msg, "Input Integer", sizeof( gt_input.str_msg ) ); }
+			else if( TUIKEY_MODE_INPUTDECIMAL == i_mode )
+				{ strncpy( gt_input.str_msg, "Input Floating Value", sizeof( gt_input.str_msg ) ); }
+			else if( TUIKEY_MODE_INPUTIPADDR == i_mode )
+				{ strncpy( gt_input.str_msg, "Input IP Address", sizeof( gt_input.str_msg ) ); }
+			else if( TUIKEY_MODE_INPUTSFXINT == i_mode )
+				{ strncpy( gt_input.str_msg, "Input Value with Suffix(K/G/M)",
+													sizeof( gt_input.str_msg ) ); }
+			else if( TUIKEY_MODE_INPUTPASSWD == i_mode )
+				{ strncpy( gt_input.str_msg, "Input Password", sizeof( gt_input.str_msg ) ); }
+			else
+				{ strncpy( gt_input.str_msg, "Input String", sizeof( gt_input.str_msg ) ); }
+		}
 
 		if( NULL != pstr_default )	{
 			if( i_buflen > (int)sizeof( gt_input.str_input ) )
@@ -226,6 +239,8 @@ int
 			gt_input.i_inputlen	= i_len;
 
 			strncpy( gt_input.str_input, pstr_default, i_buflen );
+
+			gt_input.i_cursor		= i_len;
 		}
 		else	{
 			gt_input.str_input[0]	= '\0';
@@ -233,6 +248,7 @@ int
 			gt_input.i_buflen		= sizeof( gt_input.str_input );
 		}
 	}
+	/*
 	else if( TUIKEY_MODE_INPUTPASSWD == i_mode )	{
 		gt_input.i_cursor		= 0;
 		gt_input.b_option		= b_option;
@@ -257,6 +273,7 @@ int
 			gt_input.i_buflen		= sizeof( gt_input.str_input );
 		}
 	}
+	*/
 	else if( TUIKEY_MODE_YESNO == i_mode )	{
 		if( NULL != pstr_msg )
 			{ strncpy( gt_input.str_msg, pstr_msg, sizeof( gt_input.str_msg ) ); }
@@ -311,81 +328,132 @@ int
 
 	if( ERR == i_key )	{ return i_ret; }
 
-	// Input Character ---
-	if( isprint( i_key ) )	{
-		if( gt_input.i_inputlen >= gt_input.i_buflen - 1)	{ return i_ret; }
+	// Move Cursor ---
+	if( TUIKEY_MODE_INPUTPASSWD != gi_keymode )	{
+		if(( KEY_LEFT == i_key ) || ( NCURSES_Ctrl('b') == i_key ))	{
+			if( 0 < gt_input.i_cursor )
+				{ gt_input.i_cursor--; }
 
-		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';
+			goto	goto_TuiKey_Dispatch_Mode_InputStr_post;
 		}
-		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) );
+		else if(( KEY_RIGHT == i_key ) || ( NCURSES_Ctrl('f') == i_key ))	{
+			if( gt_input.i_cursor < gt_input.i_inputlen )
+				{ gt_input.i_cursor++; }
+
+			goto	goto_TuiKey_Dispatch_Mode_InputStr_post;
+		}
+		else if( NCURSES_Ctrl('a') == i_key )	{
+			gt_input.i_cursor	= 0;
 
-			gt_input.i_inputlen++;
-			gt_input.str_input[gt_input.i_cursor]	= (char)i_key;
-			gt_input.i_cursor++;
+			goto	goto_TuiKey_Dispatch_Mode_InputStr_post;
+		}
+		else if( NCURSES_Ctrl('e') == i_key )	{
+			gt_input.i_cursor	= gt_input.i_inputlen;
+
+			goto	goto_TuiKey_Dispatch_Mode_InputStr_post;
 		}
 	}
 
 	// Enter ---
-	else if(( KEY_ENTER == i_key) || ( 10 == i_key ))	{
+	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,
 								gt_input.b_reqcmd, gt_input.b_option,
 								gt_input.i_inputlen, gt_input.str_input );
 		}
-	}
 
+		goto	goto_TuiKey_Dispatch_Mode_InputStr_post;
+	}
 	// KEY_ESC ---
 	else if( 27 == i_key )	{
 		TuiKey_ReturnMode();
-	}
 
+		goto	goto_TuiKey_Dispatch_Mode_InputStr_post;
+	}
 	// 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--;
+		if(( 0 < gt_input.i_inputlen ) && ( 0 < gt_input.i_cursor ))	{
+			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--;
+			}
 		}
-	}
 
+		goto	goto_TuiKey_Dispatch_Mode_InputStr_post;
+	}
 	// 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';
+
+		goto	goto_TuiKey_Dispatch_Mode_InputStr_post;
 	}
 
-	// Move Cursor ---
-	else if(( KEY_LEFT == i_key ) || ( NCURSES_Ctrl('b') == i_key ))	{
-		if( 0 < gt_input.i_cursor )	{ gt_input.i_cursor--; }
+	// Input Character ---
+	if( gt_input.i_inputlen >= gt_input.i_buflen - 1)
+		{ goto	goto_TuiKey_Dispatch_Mode_InputStr_post; }
+	if( ! isprint( i_key ) )	{ goto	goto_TuiKey_Dispatch_Mode_InputStr_post; }
+
+	if( TUIKEY_MODE_INPUTSTR == gi_keymode )
+		{ goto	goto_TuiKey_Dispatch_Mode_InputStr_OK; }
+	else if( TUIKEY_MODE_INPUTPASSWD == gi_keymode )
+		{ goto	goto_TuiKey_Dispatch_Mode_InputStr_OK; }
+	else if( TUIKEY_MODE_INPUTINT == gi_keymode )	{
+		if( isdigit( i_key ) )	{ goto	goto_TuiKey_Dispatch_Mode_InputStr_OK; }
 	}
-	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(( TUIKEY_MODE_INPUTDECIMAL == gi_keymode )
+			|| ( TUIKEY_MODE_INPUTIPADDR == gi_keymode ))	{
+
+		if( isdigit( i_key ) )	{ goto	goto_TuiKey_Dispatch_Mode_InputStr_OK; }
+		if( '.' == i_key )		{ goto	goto_TuiKey_Dispatch_Mode_InputStr_OK; }
 	}
-	else if( NCURSES_Ctrl('a') == i_key )	{
-		gt_input.i_cursor	= 0;
+	else if( TUIKEY_MODE_INPUTSFXINT == gi_keymode )	{
+		if( isdigit( i_key ) )	{
+			if( 0 == gt_input.i_inputlen )
+				{ goto	goto_TuiKey_Dispatch_Mode_InputStr_OK; }
+			if( isdigit( gt_input.str_input[ gt_input.i_inputlen-1 ] ) )
+				{ goto	goto_TuiKey_Dispatch_Mode_InputStr_OK; }
+		}
+
+		if(( 'k' == i_key ) || ( 'K' == i_key )
+				|| ( 'm' == i_key ) || ( 'M' == i_key )
+				|| ( 'g' == i_key ) || ( 'G' == i_key ))	{
+			if( 0 < gt_input.i_inputlen )	{
+				if( isdigit( gt_input.str_input[ gt_input.i_inputlen-1 ] ) )
+					{ goto	goto_TuiKey_Dispatch_Mode_InputStr_OK; }
+			}
+		}
 	}
-	else if( NCURSES_Ctrl('e') == i_key )	{
-		gt_input.i_cursor	= gt_input.i_inputlen;
+
+	goto	goto_TuiKey_Dispatch_Mode_InputStr_post;
+
+goto_TuiKey_Dispatch_Mode_InputStr_OK:
+
+	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;
+		gt_input.i_cursor++;
+	}
+
 
+goto_TuiKey_Dispatch_Mode_InputStr_post:
 	return i_ret;
 }
 

--- a/src/tuikey.h
+++ b/src/tuikey.h
@@ -61,9 +61,13 @@ VMTUI_TUIKEY_EXTERN int TuiKey_Term( void );
 #define	TUIKEY_MODE_GUEST			(0x02+TUIKEY_MODE_INFO)
 #define	TUIKEY_MODE_CONSOLE			(0x03+TUIKEY_MODE_INFO)
 #define	TUIKEY_MODE_ERRINFO			(0x04+TUIKEY_MODE_INFO)
-#define	TUIKEY_MODE_INPUTSTR		0x21
-#define	TUIKEY_MODE_INPUTPASSWD		0x22
-#define	TUIKEY_MODE_YESNO			0x23
+#define	TUIKEY_MODE_INPUTSTR		0x20
+#define	TUIKEY_MODE_INPUTINT		0x21	// bit 1 : digit
+#define	TUIKEY_MODE_INPUTDECIMAL	0x23	// bit 2 : digit + '.'
+#define	TUIKEY_MODE_INPUTIPADDR		0x23
+#define	TUIKEY_MODE_INPUTSFXINT		0x24	// bit 3 : suffix
+#define	TUIKEY_MODE_INPUTPASSWD		0x28	// bit 4 : password
+#define	TUIKEY_MODE_YESNO			0x50
 #define	TUIKEY_MODE_NONE			0xff
 
 #define	NCURSES_KEY_ENTER			10
@@ -99,7 +103,6 @@ typedef	struct	{
 	int		i_inputlen;
 	int		i_buflen;
 	char	str_input[512];
-	//char	str_option[512];
 	char	str_msg[128];
 	void	*pv_option;
 } TuiKey_InputLine;