コミット: 51ffafd6f49201aa0ef09d64797181af7eb40715 - vmtui (git)

Virtual machine Management Terminal User Interface

コミットメタ情報

• リビジョン: 51ffafd6f49201aa0ef09d64797181af7eb40715 (tree)
• 日時: 2023-01-07 22:42:58
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• コミッター: Koine Yuusuke(koinec)

ログメッセージ

WorkBackup

変更サマリ

• modified: src/tuiguest.c
• modified: src/tuiguest.h
• modified: src/tuisys.h
• modified: src/tuivmlist_event.h

差分

--- a/src/tuiguest.c
+++ b/src/tuiguest.c
@@ -50,13 +50,66 @@ int
 	TuiGuest_GeneratePageText(
 		int		i_guest )
 {
-	Guest	*p_guest	= NULL;
+	Guest				*p_guest	= NULL;
+	KeyVal_Data			t_kval;
+	TuiGuest_LineAttr	t_attr;
+	char				str_temp[128];
+
+	if( i_guest == lt_guest.i_guest )	{ return 0x00; }
+	lt_guest.i_guest	= i_guest;
 
 	TextBuf_Clear( &lt_guest.t_textbuf );
+	memset( &t_attr, 0x00, sizeof( TuiGuest_LineAttr ) );
+	memset( &t_kval, 0x00, sizeof( KeyVal_Data ) );
 
 	p_guest	= Guest_Ref( i_guest );
 	assert( NULL != p_guest );
 
+	// VM name ---
+	t_attr.str_key[0]	= '\0';
+	t_attr.i_attr		= A_BOLD;
+	snprintf( str_temp, sizeof( str_temp ), "  %-22s: %-40s", "VM name", p_guest->str_vmname );
+	TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, (void *)&t_attr );
+
+	TextBuf_AppendLine( &lt_guest.t_textbuf, "", 0, NULL );
+
+	// Status Section ----
+	t_attr.i_attr		= COL_CYAN | A_BOLD;
+	TextBuf_AppendLine( &lt_guest.t_textbuf, "Status", 0, (void *)&t_attr );
+
+	TextBuf_AppendLine( &lt_guest.t_textbuf, "", 0, NULL );
+
+	// Configuration Section ----
+	t_attr.i_attr		= COL_CYAN | A_BOLD;
+	TextBuf_AppendLine( &lt_guest.t_textbuf, "Configuration", 0, (void *)&t_attr );
+
+	// Loader --
+	t_attr.i_attr		= 0x00;
+	strncpy( t_attr.str_key, GUEST_LOADER_KEY, sizeof( t_attr.str_key ) );
+	KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_LOADER_KEY );
+	snprintf( str_temp, sizeof( str_temp ), "  %-22s: %s", "Loader", KEYVAL_DATA_STRING( t_kval ) );
+	TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, (void *)&t_attr );
+
+	// CPU --
+	t_attr.i_attr		= A_BOLD;
+	TextBuf_AppendLine( &lt_guest.t_textbuf, "  CPU:", 0, (void *)&t_attr );
+
+	t_attr.i_attr		= 0x00;
+	strncpy( t_attr.str_key, GUEST_CPU_VCPUS_KEY, sizeof( t_attr.str_key ) );
+	KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_CPU_VCPUS_KEY );
+	snprintf( str_temp, sizeof( str_temp ), "    %-20s: %d core", "Cores", KEYVAL_DATA_INT( t_kval ) );
+	TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, (void *)&t_attr );
+
+	// Memory --
+	t_attr.i_attr		= A_BOLD;
+	TextBuf_AppendLine( &lt_guest.t_textbuf, "  Memory:", 0, (void *)&t_attr );
+
+	t_attr.i_attr		= 0x00;
+	strncpy( t_attr.str_key, GUEST_MEM_SIZE_KEY, sizeof( t_attr.str_key ) );
+	KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_MEM_SIZE_KEY );
+	snprintf( str_temp, sizeof( str_temp ), "    %-20s: %u KByte", "Size", KEYVAL_DATA_DWORD( t_kval ) );
+	TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, (void *)&t_attr );
+
 
 	Guest_Release( p_guest );
 
@@ -71,31 +124,52 @@ int
 {
 	int		i_err;
 	int		i_guest;
+	int		i_line;
+	int		i_maxlines;
+	int		i_outlines;
+	int		i_endline;
+	char				*pstr_temp;
+	TuiGuest_LineAttr	t_attr;
 	chtype	ch_line;
 
-	//werase( gp_guest_win );
-
+	// Draw Focus Indicator ---
 	if( TUI_FOCUS_INFO == gi_tuifocus )	{ ch_line = ACS_VLINE; }
 	else	{ ch_line = ' '; }
 	wattrset( lt_guest.p_win, COLOR_PAIR(15) );
 	mvwvline( lt_guest.p_win, 1, 0, ch_line, gwl_list.i_width );
 	mvwvline( lt_guest.p_win, 1, COLS-1, ch_line, gwl_list.i_width );
 
-
+	// Check & Create Guest TextBuffer ---
 	i_err	= TuiVmList_GetCursorInfo( NULL, &i_guest );
-	if( -0x01 == i_err )	{
-		// XXX
-		mvwprintw( lt_guest.p_subwin, 0, 0, "error" );
-		goto	goto_TuiGuest_Update_post;
-	}
-	if( VMLIST_TYPE_HVISOR == i_err )	{
-		// XXX
-		mvwprintw( lt_guest.p_subwin, 0, 0, "hypervisor" );
-		goto	goto_TuiGuest_Update_post;
+	if( VMLIST_TYPE_GUEST != i_err )	{ goto	goto_TuiGuest_Update_post; }
+
+	TuiGuest_GeneratePageText( i_guest );
+
+	// Draw Text ---
+	werase( lt_guest.p_subwin );
+
+	i_maxlines	= TextBuf_GetMaxLine( &lt_guest.t_textbuf );
+	i_outlines	= i_maxlines - lt_guest.i_start_line;
+	if( i_outlines > (gwl_info.i_width - 3) )
+		{ i_outlines	= gwl_info.i_width - 3; }
+
+	i_endline	= lt_guest.i_start_line + i_outlines;
+	//mvwprintw( lt_guest.p_subwin, 0, 0, "%d %d %d", i_maxlines, i_outlines, i_endline );
+
+	for( i_line = 0; i_line < i_outlines; i_line++ )	{
+		pstr_temp	= TextBuf_GetLine( &lt_guest.t_textbuf,
+							i_line + lt_guest.i_start_line, (void *)&t_attr );
+		if( NULL == pstr_temp )	{
+			mvwprintw( lt_guest.p_subwin, i_line + 1, 0, "" );
+		} else	{
+			if( 0x00 != t_attr.i_attr )	{ wattrset( lt_guest.p_subwin, t_attr.i_attr ); }
+			mvwprintw( lt_guest.p_subwin, i_line + 1, 0, pstr_temp );
+			if( 0x00 != t_attr.i_attr )	{
+				wattroff( lt_guest.p_subwin, t_attr.i_attr );
+			}
+		}
 	}
 
-	mvwprintw( lt_guest.p_subwin, 0, 0, "Guest %d", i_guest );
-
 goto_TuiGuest_Update_post:
 	touchwin( lt_guest.p_win );
 	touchwin( lt_guest.p_subwin );
@@ -135,10 +209,13 @@ int
 {
 	int		i_err;
 
-	lt_guest.p_win		= NULL;
-	lt_guest.p_subwin	= NULL;
+	lt_guest.p_win			= NULL;
+	lt_guest.p_subwin		= NULL;
+	lt_guest.i_guest		= GUEST_ID_NONE;
+	lt_guest.i_now_line		= 0;
+	lt_guest.i_start_line	= 0;
 
-	i_err	= TextBuf_Init( &lt_guest.t_textbuf, 0, 0, 0 );
+	i_err	= TextBuf_Init( &lt_guest.t_textbuf, 0, 0, sizeof( TuiGuest_LineAttr ) );
 	if( 0x00 != i_err )	{
 		return -0x01;
 	}

--- a/src/tuiguest.h
+++ b/src/tuiguest.h
@@ -42,10 +42,18 @@ VMTUI_TUIGUEST_EXTERN int TuiGuest_Init( void );
 VMTUI_TUIGUEST_EXTERN int TuiGuest_Term( void );
 
 #ifdef VMTUI_SRC_TUIGUEST
+typedef	struct	{
+	int				i_attr;
+	char			str_key[32];
+} TuiGuest_LineAttr;
+
 static	struct	{
 	WINDOW			*p_win;
 	WINDOW			*p_subwin;
 	TextBuf_Info	t_textbuf;
+	int				i_guest;
+	int				i_now_line;
+	int				i_start_line;
 } lt_guest;
 #endif
 

--- a/src/tuisys.h
+++ b/src/tuisys.h
@@ -52,6 +52,13 @@ VMTUI_TUISYS_EXTERN WinLine	gwl_list;
 VMTUI_TUISYS_EXTERN WinLine	gwl_info;
 VMTUI_TUISYS_EXTERN int		gi_infopage;
 
+#define	COL_WHITE		COLOR_PAIR(1)
+#define	COL_GREEN		COLOR_PAIR(2)
+#define	COL_CYAN		COLOR_PAIR(3)
+#define	COL_YELLOW		COLOR_PAIR(4)
+#define	COL_RED			COLOR_PAIR(5)
+#define	COL_MAGENTA		COLOR_PAIR(6)
+
 #define	TUI_FOCUS_VMLIST	0x00
 #define	TUI_FOCUS_INFO		0x01
 #define	TUI_FOCUS_KEYLINE	0x02

--- a/src/tuivmlist_event.h
+++ b/src/tuivmlist_event.h
@@ -84,19 +84,9 @@ TuiKeyEvent_Define	KeyEvent_VmList[]	= {
 		"Up VMlist curosr."
 	},
 	{
-		'H', TUIKEY_MODE_VMLIST, VMLIST_TYPE_NONE, 0x00,
-		TuiVmListEvent_None,
-		"Show HyperVisor Information Page."
-	},
-	{
-		'G', TUIKEY_MODE_VMLIST, VMLIST_TYPE_NONE, 0x00,
-		TuiVmListEvent_None,
-		"Show Guest Information Page."
-	},
-	{
 		'?', TUIKEY_MODE_VMLIST, VMLIST_TYPE_NONE, 0x00,
 		TuiVmListEvent_None,
-		"Show Help Page."
+		"XXX Show Help Page."
 	},
 	// HyperVisor Key ---
 	{
@@ -112,18 +102,23 @@ TuiKeyEvent_Define	KeyEvent_VmList[]	= {
 	{
 		'D', TUIKEY_MODE_VMLIST, VMLIST_TYPE_HVISOR, 0x00,
 		TuiVmListEvent_None,
-		"DisConnect HyperVisor."
+		"XXX DisConnect HyperVisor."
 	},
 	{
 		't', TUIKEY_MODE_VMLIST, VMLIST_TYPE_HVISOR, 0x00,
 		TuiVmListEvent_None,
-		"Connect HyperVisor terminal (Local / SSH)"
+		"XXX Connect HyperVisor terminal (Local / SSH)"
 	},
 	{
 		'T', TUIKEY_MODE_VMLIST, VMLIST_TYPE_HVISOR, 0x00,
 		TuiVmListEvent_Test,
 		"call Test Function. (for debug)"
 	},
+	{
+		'H', TUIKEY_MODE_VMLIST, VMLIST_TYPE_NONE, 0x00,
+		TuiVmListEvent_None,
+		"XXX Show HyperVisor Information Page."
+	},
 	// Guest Operational Key ---
 	{
 		'-', TUIKEY_MODE_VMLIST, VMLIST_TYPE_DUMMY_TITLE | VMLIST_TYPE_GUEST, COLOR_PAIR(3),
@@ -138,22 +133,27 @@ TuiKeyEvent_Define	KeyEvent_VmList[]	= {
 	{
 		'r', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"Reset(Reboot) Guest machine"
+		"XXX Reset(Reboot) Guest machine"
 	},
 	{
 		'R', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"FORCE Reset(Reboot) Guest machine"
+		"XXX FORCE Reset(Reboot) Guest machine"
 	},
 	{
 		'p', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"PowerOff Guest machine"
+		"XXX PowerOff Guest machine"
 	},
 	{
 		'P', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"Force PowerOFF(Stop) Guest machine"
+		"XXX Force PowerOFF(Stop) Guest machine"
+	},
+	{
+		'G', TUIKEY_MODE_VMLIST, VMLIST_TYPE_NONE, 0x00,
+		TuiVmListEvent_None,
+		"XXX Show Guest Information Page."
 	},
 	// Guest Display Key ---
 	{
@@ -164,17 +164,17 @@ TuiKeyEvent_Define	KeyEvent_VmList[]	= {
 	{
 		'v', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"Open VNC viewer"
+		"XXX Open VNC viewer"
 	},
 	{
 		'c', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"Connect serial console"
+		"XXX Connect serial console"
 	},
 	{
 		's', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"Connect SSH terminal"
+		"XXX Connect SSH terminal"
 	},
 	// Guest Configuration Key ---
 	{
@@ -185,17 +185,17 @@ TuiKeyEvent_Define	KeyEvent_VmList[]	= {
 	{
 		'C', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"Create Guest machine"
+		"XXX Create Guest machine"
 	},
 	{
 		'E', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"Edit(Configure) Guest machine"
+		"XXX Edit(Configure) Guest machine"
 	},
 	{
 		'X', TUIKEY_MODE_VMLIST, VMLIST_TYPE_GUEST, 0x00,
 		TuiVmListEvent_None,
-		"Delete Guest machine"
+		"XXX Delete Guest machine"
 	}
 };