Commit: 52e9a543f94bb41c93cc3e508e82fa40360cf28d - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• Revision: 52e9a543f94bb41c93cc3e508e82fa40360cf28d (tree)
• Zeit: 2023-04-04 22:20:27
• Autor: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

Improve Guest line output in VMlist window.

Ändern Zusammenfassung

• modified: src/tuivmlist.c

Diff

--- a/src/tuivmlist.c
+++ b/src/tuivmlist.c
@@ -192,10 +192,14 @@ int
 	VmList_Item		*p_item;
 	char	str_fmt[32];
 	char	str_stat[16];
+	char	str_loader[32];
+	char	str_term[16];
 	char	*pstr_con;
 	char	*pstr_type;
+	char	*pstr_stat;
 	char	str_animation[5]	= "-\\|/";
 	chtype	ch_line;
+	KeyVal_Data	t_kval;
 
 	i_err	= TuiVmList_CreateList();
 
@@ -284,27 +288,41 @@ int
 
 			switch( p_guest->dw_status )	{
 				case GUEST_STATUS_STOP:
-					strncpy( str_stat, "  Stop", 15 );
+					pstr_stat	= "  Stop";
 					i_attr	= COLOR_PAIR(1);		// White-Black
 					break;
 				case GUEST_STATUS_RUN:
-					strncpy( str_stat, "* RUN", 15 );
+					pstr_stat	= "* RUN";
 					i_attr	= COL_CYAN;
 					break;
 				case GUEST_STATUS_WAIT:
-					strncpy( str_stat, "- Wait", 15 );
+					pstr_stat	= "- Wait";
 					i_attr	= COL_YELLOW;
 					break;
 				case GUEST_STATUS_UNKNOWN:
-					strncpy( str_stat, "? UNKNOWN", 15 );
+					pstr_stat	= "? UNKNOWN";
 					i_attr	= COL_MAGENTA;
 					break;
 				default:
-					strncpy( str_stat, "! BUG!!", 15 );
+					pstr_stat	= "! BUG!!";
 					i_attr	= COL_RED;
 					break;
 			}
 
+			i_err	= KeyVal_GetData( &t_kval, &(p_guest->t_info), GUEST_LOADER_LOADER_KEY );
+			if( 0x00 == i_err )
+				{ strncpy( str_loader, KEYVAL_DATA_STRING( t_kval ), sizeof(str_loader) ); }
+			else
+				{ strncpy( str_loader, "UNKNOWN", sizeof(str_loader) ); }
+
+			i_err	= KeyVal_GetData( &t_kval, &(p_guest->t_info), GUEST_VNC_ENABLE_KEY );
+			if(( 0x00 == i_err ) && KEYVAL_DATA_ISBOOL( t_kval ) )
+				{ strncpy( str_term, "[VNC/", sizeof(str_term) ); }
+			else
+				{ strncpy( str_term, "[---/", sizeof(str_term) ); }
+			// XXX
+			strncat( str_term, "---/---]", sizeof(str_term) - 5 );
+
 			if( gi_line_now == i_line )
 				{ wattrset( gp_vmlist_win, i_attr | A_REVERSE ); }
 			else
@@ -312,9 +330,10 @@ int
 
 			// 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 );
+			snprintf( str_fmt, 32, "    %%-%d.%ds %%-16s %%-16s %%-14s",
+							(COLS - 4 -1 -16 -1 -16 -1 -14 -2) , (COLS -4 -1 -16 -1 -16 -1 -14 -2) );
+			mvwprintw( gp_vmlist_win, i_line, 1, str_fmt,
+					p_guest->str_vmname, str_loader, str_term, pstr_stat );
 
 			Guest_Release( p_guest );