提交: b0c6d0e1a367fca204f3c23405a25dc08d9f5f9c - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• 修訂: b0c6d0e1a367fca204f3c23405a25dc08d9f5f9c (tree)
• 時間: 2022-05-04 13:23:29
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

[Implement] show HVisor Status
[Implement] show Guest Status Color

Change Summary

• modified: src/tuisys.c
• modified: src/tuivmlist.c

差異

--- a/src/tuisys.c
+++ b/src/tuisys.c
@@ -84,8 +84,12 @@ int
 
 	if( has_colors() )	{
 		start_color();
+		// init_pair( 0, COLOR_WHITE,	COLOR_BLACK );	// VMList Guest
 		init_pair( 1, COLOR_WHITE,	COLOR_BLACK );	// VMList Guest
-		init_pair( 2, COLOR_GREEN,	COLOR_BLACK );	// VMList HVisor
+		init_pair( 2, COLOR_GREEN,	COLOR_BLACK );	// VMList HVisor (Running)
+		init_pair( 3, COLOR_CYAN,	COLOR_BLACK );	// VMList Guest (Running)
+		init_pair( 4, COLOR_YELLOW,	COLOR_BLACK );	// VMList Guest (Others)
+		init_pair( 5, COLOR_RED,	COLOR_BLACK );	// VMList HVisor (Not Running)
 		init_pair( 10, COLOR_YELLOW,	COLOR_BLUE );	// VmTui Title Line
 		init_pair( 11, COLOR_WHITE,		COLOR_BLUE );	// Guest Info Title Line
 		init_pair( 12, COLOR_GREEN,		COLOR_BLUE );	// HVisor Info Title Line

--- a/src/tuivmlist.c
+++ b/src/tuivmlist.c
@@ -162,11 +162,12 @@ int
 	int		i_now;
 	int		i_end;
 	int		i_line	= 0;
+	int		i_attr;
 	HVisor	*p_hvisor;
 	Guest	*p_guest;
 	VmList_Item		*p_item;
 	char	str_fmt[32];
-	char	str_gstat[8];
+	char	str_stat[16];
 
 	i_err	= TuiVmList_CreateList();
 
@@ -189,18 +190,28 @@ int
 
 		if( GUEST_ID_NONE == p_item->i_guest )	{
 			// HVisor ---
+			p_hvisor	= HVisor_Ref( p_item->i_hvisor );
+
+			if( HVISOR_STATUS_CONNECTED & p_hvisor->dw_status )	{
+				strncpy( str_stat, "* ONLINE", 15 );
+				i_attr	= COLOR_PAIR(2);		// Green-Black
+			}
+			else	{
+				strncpy( str_stat, "X NotConnect", 15 );
+				i_attr	= COLOR_PAIR(5);		// Red-Black
+			}
+
 			if( gi_line_now == i_line )
-				{ wattrset( gp_vmlist_win, COLOR_PAIR(2) | A_BOLD | A_REVERSE ); }
+				{ wattrset( gp_vmlist_win, i_attr | A_BOLD | A_REVERSE ); }
 			else
-				{ wattrset( gp_vmlist_win, COLOR_PAIR(2) | A_BOLD ); }
+				{ wattrset( gp_vmlist_win, i_attr | A_BOLD ); }
 
-			p_hvisor	= HVisor_Ref( p_item->i_hvisor );
 
-			// Indent(2) + HyperName&fqdn(48+) + ConnectType(16) + State(8)
+			// Indent(2) + HyperName&fqdn(48+) + ConnectType(16) + State(10)
 			//    ConnectType: "Local", "SSH(vmbhyve)
-			snprintf( str_fmt, 32, "  %%-%d.%ds %%-16s %%-8s",
-							(COLS - 2 - 16 - 8 - 2 - 2) , (COLS - 2 - 16 - 8 - 2 - 2) );
-			mvwprintw( gp_vmlist_win, i_line, 1, str_fmt, p_hvisor->str_name, "contype", "state" );
+			snprintf( str_fmt, 32, "  %%-%d.%ds %%-16s %%-14s",
+							(COLS - 2 - 16 - 14 - 2 - 2) , (COLS - 2 - 16 - 14 - 2 - 2) );
+			mvwprintw( gp_vmlist_win, i_line, 1, str_fmt, p_hvisor->str_name, "contype", str_stat );
 
 			HVisor_Release( p_hvisor );
 
@@ -208,35 +219,41 @@ int
 		}
 		else	{
 			// Guest ---
-			if( gi_line_now == i_line )
-				{ wattrset( gp_vmlist_win, COLOR_PAIR(0) | A_REVERSE ); }
-			else
-				{ wattrset( gp_vmlist_win, COLOR_PAIR(0) ); }
-
 			p_guest		= Guest_Ref( p_item->i_guest );
 
 			switch( p_guest->dw_status )	{
 				case GUEST_STATUS_STOP:
-					strncpy( str_gstat, "Stop", 7 );
+					strncpy( str_stat, "  Stop", 15 );
+					i_attr	= COLOR_PAIR(1);		// White-Black
 					break;
 				case GUEST_STATUS_RUN:
-					strncpy( str_gstat, "RUN", 7 );
+					strncpy( str_stat, "* RUN", 15 );
+					i_attr	= COLOR_PAIR(3);		// Cyan-Black
 					break;
 				case GUEST_STATUS_WAIT:
-					strncpy( str_gstat, "Wait", 7 );
+					strncpy( str_stat, "- Wait", 15 );
+					i_attr	= COLOR_PAIR(4);		// Yellow-Black
 					break;
 				case GUEST_STATUS_UNKNOWN:
-					strncpy( str_gstat, "UNKNOWN", 7 );
+					strncpy( str_stat, "? UNKNOWN", 15 );
+					i_attr	= COLOR_PAIR(4);		// Yellow-Black
 					break;
 				default:
-					strncpy( str_gstat, "BUG!!", 7 );
+					strncpy( str_stat, "! BUG!!", 15 );
+					i_attr	= COLOR_PAIR(4);		// Yellow-Black
 					break;
 			}
 
+			if( gi_line_now == i_line )
+				{ wattrset( gp_vmlist_win, i_attr | A_REVERSE ); }
+			else
+				{ wattrset( gp_vmlist_win, i_attr ); }
 
-			snprintf( str_fmt, 32, "    %%-%d.%ds %%-16s %%-8s",
-							(COLS - 4 - 16 - 8 - 2 - 2) , (COLS - 4 - 16 - 8 - 2 - 2) );
-			mvwprintw( gp_vmlist_win, i_line, 1, str_fmt, p_guest->str_vmname, "type", str_gstat );
+			// Indent(2) + HyperName&fqdn(48+) + ConnectType(16) + State(10)
+			//    ConnectType: "Local", "SSH(vmbhyve)
+			snprintf( str_fmt, 32, "    %%-%d.%ds %%-16s %%-14s",
+							(COLS - 4 - 16 - 14 - 2 - 2) , (COLS - 4 - 16 - 14 - 2 - 2) );
+			mvwprintw( gp_vmlist_win, i_line, 1, str_fmt, p_guest->str_vmname, "type", str_stat );
 
 			Guest_Release( p_guest );