Commit: 576b2cfeebcb0397a69ce514ead3f94957bf06fa - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• Révision: 576b2cfeebcb0397a69ce514ead3f94957bf06fa (tree)
• l'heure: 2022-07-24 20:31:02
• Auteur: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Message de Log

Implement Check Yes/No for system quit.

Change Summary

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

Modification

--- a/src/tuicmd.c
+++ b/src/tuicmd.c
@@ -46,19 +46,18 @@ int
 
 	pstr_prompt	= TuiKey_GetPromptString();
 
+	mvwprintw( gp_cmd_win, 0, 0, "%s", pstr_prompt );
+
 	i_mode	= TuiKey_GetMode();
 	if( TUIKEY_MODE_INPUTSTR == i_mode )	{
 		pstr_input	= TuiKey_GetInputStringAndPasswd( NULL );
-		mvwprintw( gp_cmd_win, 0, 0, "%s => %s", pstr_prompt, pstr_input );
+		wprintw( gp_cmd_win, " => %s", pstr_input );
 	}
 	else if( TUIKEY_MODE_INPUTPASSWD == i_mode )	{
 		pstr_input	= TuiKey_GetInputStringAndPasswd( &i_len );
 		str_pass[ i_len-- ]	= '\0';
 		for( ; 0 <= i_len; i_len-- )	{ str_pass[ i_len ]	= '*'; }
-		mvwprintw( gp_cmd_win, 0, 0, "%s => %s", pstr_prompt, str_pass );
-	}
-	if( TUIKEY_MODE_VMLIST == i_mode )	{
-		mvwprintw( gp_cmd_win, 0, 0, "%s :", pstr_prompt );
+		wprintw( gp_cmd_win, " => %s", str_pass );
 	}
 
 	touchwin( gp_cmd_win );

--- a/src/tuikey.c
+++ b/src/tuikey.c
@@ -159,13 +159,13 @@ int
 		strncpy( gt_input.str_msg, "Input 'Y'/'y'(YES) or OtherKey(No) ? ", sizeof( gt_input.str_msg ) );
 	}
 	else	{
-		gi_keymode		= TUIKEY_MODE_VMLIST;
+		gi_keymode			= TUIKEY_MODE_VMLIST;
 
-		gt_input.b_reqcmd		= REQUEST_CMD_NONE;
-		gt_input.i_hvisor		= HVISOR_ID_NONE;
-		gt_input.i_guest		= GUEST_ID_NONE;
+		gt_input.b_reqcmd	= REQUEST_CMD_NONE;
+		gt_input.i_hvisor	= HVISOR_ID_NONE;
+		gt_input.i_guest	= GUEST_ID_NONE;
 
-		strncpy( gt_input.str_msg, "Input Command", sizeof( gt_input.str_msg ) );
+		strncpy( gt_input.str_msg, "Input Command :", sizeof( gt_input.str_msg ) );
 	}
 
 	return	0x00;
@@ -179,6 +179,8 @@ int
 {
 	int		i_ret	= 0x00;
 
+	if( ERR == i_key )	{ return i_ret; }
+
 	if( isprint( i_key ) )	{
 		if( gt_input.i_inputlen < sizeof(gt_input.str_input) - 1)	{
 			gt_input.str_input[gt_input.i_inputlen++]	= (char)i_key;
@@ -218,8 +220,13 @@ int
 {
 	int		i_ret	= 0x00;
 
+	if( ERR == i_key )	{ return i_ret; }
+
 	if(( 'Y' == i_key) || ( 'y' == i_key ))	{
-		ReqCtl_CreateRequest( gt_input.b_reqcmd, gt_input.i_hvisor, gt_input.i_guest, NULL );
+		if( REQUEST_CMD_SYS_QUIT != gt_input.b_reqcmd )
+			{ ReqCtl_CreateRequest( gt_input.b_reqcmd, gt_input.i_hvisor, gt_input.i_guest, NULL ); }
+		else
+			{ i_ret	= 0x01; }
 	}
 
 	TuiKey_ChangeMode( TUIKEY_MODE_VMLIST, REQUEST_CMD_NONE, 0x00, 0x00 );
@@ -238,7 +245,7 @@ int
 	switch( i_key )	{
 		// Quit VMTUI ----
 		case 'q':
-			i_ret	= 0x01;
+			TuiKey_ChangeMode( TUIKEY_MODE_YESNO, REQUEST_CMD_SYS_QUIT, HVISOR_ID_NONE, GUEST_ID_NONE );
 			break;
 
 		// PrevPage Info. Window ----
@@ -279,10 +286,6 @@ int
 			refresh();
 			break;
 
-		case 'i':
-			//TuiKey_ChangeMode( TUIKEY_MODE_YESNO, REQUEST_ID_NONE, 
-			refresh();
-			break;
 		/*
 		case ERR:
 			break;