Commit: a08e482005bcc042c91e7022d6a0135778f2883e - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• Revision: a08e482005bcc042c91e7022d6a0135778f2883e (tree)
• Time: 2023-07-02 21:21:36
• Author: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

WorkBackup

Change Summary

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

Incremental Difference

--- a/src/tuicmd.c
+++ b/src/tuicmd.c
@@ -52,7 +52,13 @@ int
 	mvwprintw( gp_cmd_win, 0, 0, "%s => ", pstr_prompt );
 
 	i_mode	= TuiKey_GetMode();
-	if( TUIKEY_MODE_INPUTSTR == i_mode )	{
+	if( TUIKEY_MODE_INPUTPASSWD == i_mode )	{
+		pstr_input	= TuiKey_GetInputStringAndPasswd( &i_len, NULL );
+		str_pass[ i_len-- ]	= '\0';
+		for( ; 0 <= i_len; i_len-- )	{ str_pass[ i_len ]	= '*'; }
+		wprintw( gp_cmd_win, "%s", str_pass );
+	}
+	else if( TUIKEY_MODE_INPUTSTR & i_mode )	{
 		getyx( gp_cmd_win, i_row, i_start );
 
 		pstr_input	= TuiKey_GetInputStringAndPasswd( NULL, &i_cursor );
@@ -60,12 +66,6 @@ int
 
 		wmove( gp_cmd_win, i_row, i_start + i_cursor );
 	}
-	else if( TUIKEY_MODE_INPUTPASSWD == i_mode )	{
-		pstr_input	= TuiKey_GetInputStringAndPasswd( &i_len, NULL );
-		str_pass[ i_len-- ]	= '\0';
-		for( ; 0 <= i_len; i_len-- )	{ str_pass[ i_len ]	= '*'; }
-		wprintw( gp_cmd_win, "%s", str_pass );
-	}
 
 	touchwin( gp_cmd_win );
 	wnoutrefresh( gp_cmd_win );

--- a/src/tuiguest.c
+++ b/src/tuiguest.c
@@ -74,6 +74,7 @@ int
 	TuiGuest_InputItem(
 			void )
 {
+	int					i_mode;
 	Guest				*p_guest;
 	KeyVal_Data			t_val;
 	TuiGuest_LineAttr	t_attr;
@@ -81,7 +82,10 @@ int
 	TextBuf_GetLine( &lt_guest.t_textbuf,
 							lt_guest.i_now_line, (void *)&t_attr );
 
-	if( '\0' == t_attr.str_key[0] )	{ goto	goto_TuiGuest_InputItem_post; }
+	if( TUIGUEST_LINE_EDITABLE != ( TUIGUEST_LINE_EDITABLE & t_attr.dw_option ))
+		{ goto	goto_TuiGuest_InputItem_post; }
+
+	//if( '\0' == t_attr.str_key[0] )	{ goto	goto_TuiGuest_InputItem_post; }
 
 	p_guest	= Guest_Ref( lt_guest.i_guest );
 	if( NULL == p_guest )	{ goto	goto_TuiGuest_InputItem_post; }
@@ -90,8 +94,19 @@ int
 
 	Guest_Release( p_guest );
 
+	if( TUIGUEST_LINE_PASSWORD == (TUIGUEST_LINE_PASSWORD & t_attr.dw_option) )
+		{ i_mode	= TUIKEY_MODE_INPUTPASSWD; }
+	else if( TUIGUEST_LINE_IPADDR == (TUIGUEST_LINE_IPADDR & t_attr.dw_option) )
+		{ ErrInfo_DebugMsg( "ipaddr" );i_mode	= TUIKEY_MODE_INPUTIPADDR; }
+	else if( TUIGUEST_LINE_DECIMAL == (TUIGUEST_LINE_DECIMAL & t_attr.dw_option) )
+		{ i_mode	= TUIKEY_MODE_INPUTDECIMAL; }
+	else if( TUIGUEST_LINE_INTEGER == (TUIGUEST_LINE_INTEGER & t_attr.dw_option) )
+		{ i_mode	= TUIKEY_MODE_INPUTINTEGER; }
+	else
+		{ i_mode	= TUIKEY_MODE_INPUTSTR; }
+
 	if( IS_KEYVAL_TYPE_STRING( t_val ) )	{
-		TuiKey_ChangeMode( TUIKEY_MODE_INPUTSTR, REQUEST_CMD_NONE,
+		TuiKey_ChangeMode( i_mode, REQUEST_CMD_NONE,
 						HVISOR_ID_NONE, lt_guest.i_guest,
 						TuiGuest_InputString, 0x00, TUIKEY_MODE_INFO,
 						"Input Value:", KEYVAL_DATA_STRING(t_val), KEYVAL_MAXLEN_STRVAL );
@@ -156,6 +171,32 @@ int
 
 /* ===========================================================================*/
 int
+	TuiGuest_AppendLine(
+		char			*pstr_line,
+		char			*pstr_key,
+		int				i_attr,
+		DWord			dw_option,
+		ConfFile_SelectValue	*pt_select,
+		ConfFile_CheckValue		pf_check )
+{
+	TuiGuest_LineAttr	t_attr;
+
+	t_attr.i_attr		= i_attr;
+	t_attr.dw_option	= dw_option;
+	t_attr.pt_select	= pt_select;
+	t_attr.pf_check		= pf_check;
+	if( NULL != pstr_key )
+		{ strncpy( t_attr.str_key, pstr_key, sizeof( t_attr.str_key ) ); }
+	else
+		{ t_attr.str_key[0]	= '\0'; }
+
+	TextBuf_AppendLine( &lt_guest.t_textbuf, pstr_line, 0, (void *)&t_attr );
+
+	return 0x00;
+}
+
+/* ===========================================================================*/
+int
 	TuiGuest_OutputLine(
 		KeyVal_Info		*pt_kvinfo,
 		char			*pstr_title,
@@ -163,23 +204,20 @@ int
 		Byte			b_level,
 		char			*pstr_unit,
 		int				i_attr,
-		DWord			dw_option )
+		DWord			dw_option,
+		ConfFile_SelectValue	*pt_select,
+		ConfFile_CheckValue		pf_check )
 {
 	int					i_err;
 	char				str_temp[128];
 	char				str_format[32];
 	KeyVal_Data			t_kval;
-	TuiGuest_LineAttr	t_attr;
 	int					i_len;
 	int					i_fmt;
 
 	i_len	= sizeof( str_temp );
 	i_fmt	= sizeof( str_format );
 
-	t_attr.i_attr		= i_attr;
-	t_attr.dw_option	= dw_option;
-	strncpy( t_attr.str_key, pstr_key, sizeof( t_attr.str_key ) );
-
 	i_err	= KeyVal_GetData( &t_kval, pt_kvinfo, pstr_key );
 	if( 0x00 != i_err )	{
 		return -0x01;
@@ -236,7 +274,7 @@ int
 	if( NULL != pstr_unit )
 		{ strncat( str_temp, pstr_unit, i_len ); }
 
-	TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, (void *)&t_attr );
+	TuiGuest_AppendLine( str_temp, pstr_key, i_attr, dw_option, pt_select, pf_check );
 
 	return 0x00;
 }
@@ -249,6 +287,7 @@ int
 	int					i_err;
 	int					i_cnt;
 	int					i_max;
+	int					i_attr;
 	char				str_temp[128];
 	char				str_key[KEYVAL_MAXLEN_KEY];
 	KeyVal_Data			t_kval;
@@ -266,85 +305,77 @@ int
 	assert( NULL != p_guest );
 
 	// VM name ---
-	t_attr.str_key[0]	= '\0';
-	t_attr.i_attr		= A_BOLD;
-	t_attr.dw_option	= TUIGUEST_LINEATTR_ONLYVALUE;
 	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 );
+	TuiGuest_AppendLine( str_temp, NULL, A_BOLD, TUIGUEST_LINEATTR_ONLYVALUE, NULL, NULL );
 
-	t_attr.i_attr		= 0x00;
-	t_attr.dw_option	= TUIGUEST_LINEATTR_NORMAL;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "", 0, NULL );
+	TuiGuest_AppendLine( "", NULL, 0x00, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );	// Empty line
 
 	// Status Section ----
-	t_attr.i_attr		= COL_CYAN | A_BOLD;
-	t_attr.dw_option	= TUIGUEST_LINEATTR_NORMAL;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "Running Information", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "Running Information", NULL, COL_CYAN|A_BOLD,
+							TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
-	t_attr.i_attr		= 0x00;
-	t_attr.dw_option	= TUIGUEST_LINEATTR_NORMAL;
+	i_attr		= 0x00;
 	switch( p_guest->dw_status )	{
 		case GUEST_STATUS_STOP:
 			snprintf( str_temp, sizeof( str_temp ), "  %-22s: %-40s", "Status", "  Stop" );
 			break;
 		case GUEST_STATUS_RUN:
+			i_attr		= COL_CYAN | A_BOLD;
 			snprintf( str_temp, sizeof( str_temp ), "  %-22s: %-40s", "Status", "* RUNNING" );
-			t_attr.i_attr		= COL_CYAN | A_BOLD;
-			t_attr.dw_option	= TUIGUEST_LINEATTR_ONLYVALUE;
 			break;
 		case GUEST_STATUS_WAIT:
+			i_attr		= COL_YELLOW | A_BOLD;
 			snprintf( str_temp, sizeof( str_temp ), "  %-22s: %-40s", "Status", "- Waiting" );
-			t_attr.i_attr		= COL_YELLOW | A_BOLD;
-			t_attr.dw_option	= TUIGUEST_LINEATTR_ONLYVALUE;
 			break;
 		case GUEST_STATUS_UNKNOWN:
-			t_attr.i_attr		= COL_MAGENTA | A_BOLD;
-			t_attr.dw_option	= TUIGUEST_LINEATTR_ONLYVALUE;
+			i_attr		= COL_MAGENTA | A_BOLD;
 			snprintf( str_temp, sizeof( str_temp ), "  %-22s: %-40s", "Status", "? Unknown" );
 			break;
 		default:
-			t_attr.i_attr		= COL_RED | A_BOLD;
-			t_attr.dw_option	= TUIGUEST_LINEATTR_ONLYVALUE;
+			i_attr		= COL_RED | A_BOLD;
 			snprintf( str_temp, sizeof( str_temp ), "  %-22s: %-40s", "Status", "! BUG!!" );
 			break;
 	}
-	TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, (void *)&t_attr );
+	TuiGuest_AppendLine( str_temp, NULL, i_attr, TUIGUEST_LINEATTR_ONLYVALUE, NULL, NULL );
 
-	t_attr.i_attr		= 0x00;
-	t_attr.dw_option	= TUIGUEST_LINEATTR_NORMAL;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "", 0, NULL );
+	TuiGuest_AppendLine( "", NULL, 0x00, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );	// Empty line
 
 	// Configuration Section ----
-	t_attr.i_attr		= COL_CYAN | A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "Configuration", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "Configuration", NULL, COL_CYAN|A_BOLD,
+							TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 	// Loader --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  Loader:", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "  Loader:", NULL, A_BOLD, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
-	TuiGuest_OutputLine( &(p_guest->t_info), "Loader", GUEST_LOADER_LOADER_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "BhyveLoader", GUEST_LOADER_BHYVELOADER_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "TimeOut", GUEST_LOADER_TIMEOUT_KEY, 1, "sec", 0x00, 0x00 );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Loader", GUEST_LOADER_LOADER_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "BhyveLoader", GUEST_LOADER_BHYVELOADER_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "TimeOut", GUEST_LOADER_TIMEOUT_KEY, 1,
+							"sec", 0x00, 0x00, NULL, NULL );
 
 	// CPU --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  CPU:", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "  CPU:", NULL, A_BOLD, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
-	TuiGuest_OutputLine( &(p_guest->t_info), "CPUs", GUEST_CPU_VCPUS_KEY, 1, "cpu", 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Sockets", GUEST_CPU_SOCKETS_KEY, 1, "socket", 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Cores", GUEST_CPU_CORES_KEY, 1, "core", 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Threads", GUEST_CPU_THREADS_KEY, 1, "thread", 0x00, 0x00 );
+	TuiGuest_OutputLine( &(p_guest->t_info), "CPUs", GUEST_CPU_VCPUS_KEY, 1,
+							"cpu", 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Sockets", GUEST_CPU_SOCKETS_KEY, 1,
+							"socket", 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Cores", GUEST_CPU_CORES_KEY, 1,
+							"core", 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Threads", GUEST_CPU_THREADS_KEY, 1,
+							"thread", 0x00, 0x00, NULL, NULL );
 
 	// Memory --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  Memory:", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "  Memory:", NULL, A_BOLD, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
-	TuiGuest_OutputLine( &(p_guest->t_info), "Size", GUEST_MEM_SIZE_KEY, 1, "KByte", 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Wired", GUEST_MEM_WIRED_KEY, 1, NULL, 0x00, 0x00 );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Size", GUEST_MEM_SIZE_KEY, 1,
+							"KByte", 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Wired", GUEST_MEM_WIRED_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
 
 	// Network --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  Network:", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "  Network:", NULL, A_BOLD, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 	i_err	= KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_NETWORK_ITEMS_KEY );
 	if( 0x00 != i_err )	{ goto	goto_TuiGuest_GeneratePageText_skipNetwork; }
@@ -352,217 +383,275 @@ int
 
 	i_max	= KEYVAL_DATA_INT( t_kval );
 	for( i_cnt = 0; i_cnt < i_max; i_cnt++ )	{
-		t_attr.i_attr		= 0x00;
 		snprintf( str_temp, sizeof( str_temp ), "    Network #%d:", i_cnt );
-		TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, NULL );
+		TuiGuest_AppendLine( str_temp, NULL, 0x00, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_NETWORK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_NETWORK_TYPE_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "Type", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "Type", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_NETWORK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_NETWORK_SWITCH_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "Switch", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "Switch", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_NETWORK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_NETWORK_DEVICE_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "Device", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "Device", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_NETWORK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_NETWORK_MAC_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "MAC address", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "MAC address", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_NETWORK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_NETWORK_SPAN_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "SPAN", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "SPAN", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 	}
 
 goto_TuiGuest_GeneratePageText_skipNetwork:
 
 	// Disk --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  Disk:", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "  Disk:", NULL, A_BOLD, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 	i_err	= KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_DISK_ITEMS_KEY );
-	if( 0x00 != i_err )	{ goto	goto_TuiGuest_GeneratePageText_skipDisk; }
-	if( 0 == KEYVAL_DATA_INT( t_kval ) ) { goto	goto_TuiGuest_GeneratePageText_skipDisk; }
+	if( 0x00 != i_err )
+		{ goto	goto_TuiGuest_GeneratePageText_skipDisk; }
+	if( 0 == KEYVAL_DATA_INT( t_kval ) )
+		{ goto	goto_TuiGuest_GeneratePageText_skipDisk; }
 
 	i_max	= KEYVAL_DATA_INT( t_kval );
 	for( i_cnt = 0; i_cnt < i_max; i_cnt++ )	{
-		t_attr.i_attr		= 0x00;
 		snprintf( str_temp, sizeof( str_temp ), "    Disk #%d:", i_cnt );
-		TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, NULL );
+		TuiGuest_AppendLine( str_temp, NULL, 0x00, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_DISK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_DISK_TYPE_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "Type", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "Type", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_DISK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_DISK_NAME_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "Name", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "Name", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_DISK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_DISK_DEVICE_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "Device", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "Device", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_DISK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_DISK_OPTION_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "Option", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "Option", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_NETWORK_BASEKEY"/%d/%s",
 					i_cnt, GUEST_DISK_SIZE_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), "Size", str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), "Size", str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 	}
 
 goto_TuiGuest_GeneratePageText_skipDisk:
 
 	// Graphics (VNC) --
 	i_err	= KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_VNC_ENABLE_KEY );
-	if( 0x00 != i_err )	{ goto	goto_TuiGuest_GeneratePageText_skipVNC; }
-	if( ! KEYVAL_DATA_ISBOOL( t_kval ) )	{ goto	goto_TuiGuest_GeneratePageText_skipVNC; }
-
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  Graphics (VNC):", 0, (void *)&t_attr );
-
-	TuiGuest_OutputLine( &(p_guest->t_info), "Enable", GUEST_VNC_ENABLE_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Host", GUEST_VNC_HOST_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Port", GUEST_VNC_PORT_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Reslution", GUEST_VNC_RESOLUTION_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Wait", GUEST_VNC_WAIT_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "VGA", GUEST_VNC_VGA_KEY, 1, NULL, 0x00, 0x00 );
+	if( 0x00 != i_err )
+		{ goto	goto_TuiGuest_GeneratePageText_skipVNC; }
+	if( ! KEYVAL_DATA_ISBOOL( t_kval ) )
+		{ goto	goto_TuiGuest_GeneratePageText_skipVNC; }
+
+	TuiGuest_AppendLine( "  Graphics (VNC):", NULL, A_BOLD,
+							TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
+
+	TuiGuest_OutputLine( &(p_guest->t_info), "Enable", GUEST_VNC_ENABLE_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Host", GUEST_VNC_HOST_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Port", GUEST_VNC_PORT_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Reslution", GUEST_VNC_RESOLUTION_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Wait", GUEST_VNC_WAIT_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "VGA", GUEST_VNC_VGA_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
 
 goto_TuiGuest_GeneratePageText_skipVNC:
 
 	// SSH --
 	i_err	= KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_SSH_ENABLE_KEY );
-	if( 0x00 != i_err )	{ goto	goto_TuiGuest_GeneratePageText_skipSSH; }
-	if( ! KEYVAL_DATA_ISBOOL( t_kval ) )	{ goto	goto_TuiGuest_GeneratePageText_skipSSH; }
-
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  Secure Shell (SSH):", 0, (void *)&t_attr );
-
-	TuiGuest_OutputLine( &(p_guest->t_info), "Enable", GUEST_SSH_ENABLE_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "IP Address", GUEST_SSH_IPADDR_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Use Step Server", GUEST_SSH_USE_STEPSERVER_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "USER", GUEST_SSH_USER_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Password", GUEST_SSH_PASSWORD_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Connection Type", GUEST_SSH_CONTYPE_KEY, 1, NULL, 0x00, 0x00 );
+	if( 0x00 != i_err )
+		{ goto	goto_TuiGuest_GeneratePageText_skipSSH; }
+	if( ! KEYVAL_DATA_ISBOOL( t_kval ) )
+		{ goto	goto_TuiGuest_GeneratePageText_skipSSH; }
+
+	TuiGuest_AppendLine( "  Secure Shell (SSH):", NULL, A_BOLD,
+							TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
+
+	TuiGuest_OutputLine( &(p_guest->t_info), "Enable", GUEST_SSH_ENABLE_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "IP Address", GUEST_SSH_IPADDR_KEY, 1,
+							NULL, 0x00, TUIGUEST_LINE_DYNAMIC | TUIGUEST_LINE_IPADDR,
+							NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Use Step Server", GUEST_SSH_USE_STEPSERVER_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "USER", GUEST_SSH_USER_KEY, 1,
+							NULL, 0x00, TUIGUEST_LINE_DYNAMIC | TUIGUEST_LINE_STRING,
+							NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Password", GUEST_SSH_PASSWORD_KEY, 1,
+							NULL, 0x00, TUIGUEST_LINE_DYNAMIC | TUIGUEST_LINE_PASSWORD,
+							NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Connection Type", GUEST_SSH_CONTYPE_KEY, 1,
+							NULL, 0x00, 0x00,
+							NULL, NULL );
 
 goto_TuiGuest_GeneratePageText_skipSSH:
 
 	// Grub --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  GRUB:", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "  GRUB:", NULL, A_BOLD, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
-	TuiGuest_OutputLine( &(p_guest->t_info), "Run Partition", GUEST_GRUB_RUNPARTITION_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Run Directory", GUEST_GRUB_RUNDIR_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Run File", GUEST_GRUB_RUNFILE_KEY, 1, NULL, 0x00, 0x00 );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Run Partition", GUEST_GRUB_RUNPARTITION_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Run Directory", GUEST_GRUB_RUNDIR_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Run File", GUEST_GRUB_RUNFILE_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
 
 	i_err	= KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_GRUB_INSTALL_ITEMS_KEY );
-	if( 0x00 != i_err )	{ goto	goto_TuiGuest_GeneratePageText_skipGRUB_Install; }
-	if( 0 == KEYVAL_DATA_INT( t_kval ) ) { goto	goto_TuiGuest_GeneratePageText_skipGRUB_Install; }
+	if( 0x00 != i_err )
+		{ goto	goto_TuiGuest_GeneratePageText_skipGRUB_Install; }
+	if( 0 == KEYVAL_DATA_INT( t_kval ) )
+		{ goto	goto_TuiGuest_GeneratePageText_skipGRUB_Install; }
 
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  GRUB Install Command:", 0, NULL );
+	TuiGuest_AppendLine( "  GRUB Install Command:", NULL, 0x00,
+							TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 	i_max	= KEYVAL_DATA_INT( t_kval );
 	for( i_cnt = 0; i_cnt < i_max; i_cnt++ )	{
-		t_attr.i_attr		= 0x00;
 		snprintf( str_temp, sizeof( str_temp ), "    #%d:", i_cnt );
-		TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, NULL );
+		TuiGuest_AppendLine( str_temp, NULL, 0x00, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_GRUB_BASEKEY"/%d/%s",
 					i_cnt, GUEST_GRUB_INSTALL_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), str_temp, str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), str_temp, str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 	}
 
 goto_TuiGuest_GeneratePageText_skipGRUB_Install:
 
 	i_err	= KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_GRUB_RUN_ITEMS_KEY );
-	if( 0x00 != i_err )	{ goto	goto_TuiGuest_GeneratePageText_skipGRUB_Run; }
-	if( 0 == KEYVAL_DATA_INT( t_kval ) ) { goto	goto_TuiGuest_GeneratePageText_skipGRUB_Run; }
+	if( 0x00 != i_err )
+		{ goto	goto_TuiGuest_GeneratePageText_skipGRUB_Run; }
+	if( 0 == KEYVAL_DATA_INT( t_kval ) )
+		{ goto	goto_TuiGuest_GeneratePageText_skipGRUB_Run; }
 
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  GRUB Run Command:", 0, NULL );
+	TuiGuest_AppendLine( "  GRUB Run Command:", NULL, 0x00,
+							TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 	i_max	= KEYVAL_DATA_INT( t_kval );
 	for( i_cnt = 0; i_cnt < i_max; i_cnt++ )	{
-		t_attr.i_attr		= 0x00;
 		snprintf( str_temp, sizeof( str_temp ), "    #%d:", i_cnt );
-		TextBuf_AppendLine( &lt_guest.t_textbuf, str_temp, 0, NULL );
+		TuiGuest_AppendLine( str_temp, NULL, 0x00, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 		snprintf( str_key, sizeof( str_key ), GUEST_GRUB_BASEKEY"/%d/%s",
 					i_cnt, GUEST_GRUB_RUN_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), str_temp, str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), str_temp, str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 	}
 
 goto_TuiGuest_GeneratePageText_skipGRUB_Run:
 
 	// Other Settings --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  Other Settings:", 0, (void *)&t_attr );
-
-	TuiGuest_OutputLine( &(p_guest->t_info), "HostBridge", GUEST_HOSTBRIDGE_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Com Ports", GUEST_COMPORTS_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Use UTC time", GUEST_UTCTIME_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Enable DebugLog", GUEST_DEBUG_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "UUID", GUEST_UUID_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Ignore Bad MSR", GUEST_IGNORE_BADMSR_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "VirtIO Random", GUEST_VIRT_RANDOM_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Enable XHCI mouse", GUEST_XHCI_MOUSE_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "AHCI Device Limits", GUEST_AHCI_DEVLIMIT_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Start Slot", GUEST_START_SLOT_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Install Slot", GUEST_INSTALL_SLOT_KEY, 1, NULL, 0x00, 0x00 );
+	TuiGuest_AppendLine( "  Other Settings:", NULL, A_BOLD,
+							TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
+
+	TuiGuest_OutputLine( &(p_guest->t_info), "HostBridge", GUEST_HOSTBRIDGE_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Com Ports", GUEST_COMPORTS_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Use UTC time", GUEST_UTCTIME_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Enable DebugLog", GUEST_DEBUG_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "UUID", GUEST_UUID_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Ignore Bad MSR", GUEST_IGNORE_BADMSR_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "VirtIO Random", GUEST_VIRT_RANDOM_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Enable XHCI mouse", GUEST_XHCI_MOUSE_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "AHCI Device Limits", GUEST_AHCI_DEVLIMIT_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Start Slot", GUEST_START_SLOT_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Install Slot", GUEST_INSTALL_SLOT_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
 
 	// Bhyve Settings --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  BHYVE Settings:", 0, (void *)&t_attr );
-
-	TuiGuest_OutputLine( &(p_guest->t_info), "Priority", GUEST_BHYVE_PRIORITY_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Add Option", GUEST_BHYVE_OPTIONS_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Enable PreStart", GUEST_BHYVE_PRESTART_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Enable AutoStart", GUEST_BHYVE_AUTOSTART_KEY, 1, NULL, 0x00, 0x00 );
+	TuiGuest_AppendLine( "  BHYVE Settings:", NULL, A_BOLD,
+							TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
+
+	TuiGuest_OutputLine( &(p_guest->t_info), "Priority", GUEST_BHYVE_PRIORITY_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Add Option", GUEST_BHYVE_OPTIONS_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Enable PreStart", GUEST_BHYVE_PRESTART_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Enable AutoStart", GUEST_BHYVE_AUTOSTART_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
 
 	// Passthru --
 	i_err	= KeyVal_GetData( &t_kval, &p_guest->t_info, GUEST_PASSTHRU_ITEMS_KEY );
 	if( 0x00 != i_err )	{ goto	goto_TuiGuest_GeneratePageText_skipPassThru; }
 	if( 0 == KEYVAL_DATA_INT( t_kval ) ) { goto	goto_TuiGuest_GeneratePageText_skipPassThru; }
 
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "    PassThru:", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "    PassThru:", NULL, A_BOLD, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
 	i_max	= KEYVAL_DATA_INT( t_kval );
 	for( i_cnt = 0; i_cnt < i_max; i_cnt++ )	{
-		t_attr.i_attr		= 0x00;
 		snprintf( str_temp, sizeof( str_temp ), "PassThru #%d:", i_cnt );
 		snprintf( str_key, sizeof( str_key ), GUEST_PASSTHRU_BASEKEY"/%d/%s",
 					i_cnt, GUEST_PASSTHRU_SUBKEY );
-		TuiGuest_OutputLine( &(p_guest->t_info), str_temp, str_key, 2, NULL, 0x00, 0x00 );
+		TuiGuest_OutputLine( &(p_guest->t_info), str_temp, str_key, 2,
+								NULL, 0x00, 0x00, NULL, NULL );
 	}
 
 goto_TuiGuest_GeneratePageText_skipPassThru:
 
 	// DataStore --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  DataStore:", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "  DataStore:", NULL, A_BOLD, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
-	TuiGuest_OutputLine( &(p_guest->t_info), "Name", GUEST_DATASTORE_NAME_KEY, 1, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Path", GUEST_DATASTORE_PATH_KEY, 1, NULL, 0x00, 0x00 );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Name", GUEST_DATASTORE_NAME_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Path", GUEST_DATASTORE_PATH_KEY, 1,
+							NULL, 0x00, 0x00, NULL, NULL );
 
 	// ZFS -
-	t_attr.i_attr		= 0x00;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "    ZFS Option:", 0, (void *)&t_attr );
+	TuiGuest_AppendLine( "    ZFS Option:", NULL, 0x00, TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
 
-	TuiGuest_OutputLine( &(p_guest->t_info), "Dataset Option", GUEST_ZFS_DATASETOPTS_KEY, 2, NULL, 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "ZVolume Option", GUEST_ZFS_ZVOLOPTS_KEY, 2, NULL, 0x00, 0x00 );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Dataset Option", GUEST_ZFS_DATASETOPTS_KEY, 2,
+							NULL, 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "ZVolume Option", GUEST_ZFS_ZVOLOPTS_KEY, 2,
+							NULL, 0x00, 0x00, NULL, NULL );
 
 	// Resource Limitter --
-	t_attr.i_attr		= A_BOLD;
-	TextBuf_AppendLine( &lt_guest.t_textbuf, "  Resource Limitter Settings:", 0, (void *)&t_attr );
-
-	TuiGuest_OutputLine( &(p_guest->t_info), "CPU usage", GUEST_LIMIT_CPU_PER_KEY, 1, "%", 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Disk Read bps", GUEST_LIMIT_DISK_READ_BPS_KEY, 1, "bps", 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Disk Read IOPS", GUEST_LIMIT_DISK_READ_IOPS_KEY, 1, "IOPS", 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Disk Write bps", GUEST_LIMIT_DISK_WRITE_BPS_KEY, 1, "bps", 0x00, 0x00 );
-	TuiGuest_OutputLine( &(p_guest->t_info), "Disk Write IOPS", GUEST_LIMIT_DISK_WRITE_IOPS_KEY, 1, "IOPS", 0x00, 0x00 );
+	TuiGuest_AppendLine( "  Resource Limitter Settings:", NULL, A_BOLD,
+							TUIGUEST_LINEATTR_NORMAL, NULL, NULL );
+
+	TuiGuest_OutputLine( &(p_guest->t_info), "CPU usage", GUEST_LIMIT_CPU_PER_KEY, 1,
+							"%", 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Disk Read bps", GUEST_LIMIT_DISK_READ_BPS_KEY, 1,
+							"bps", 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Disk Read IOPS", GUEST_LIMIT_DISK_READ_IOPS_KEY, 1,
+							"IOPS", 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Disk Write bps", GUEST_LIMIT_DISK_WRITE_BPS_KEY, 1,
+							"bps", 0x00, 0x00, NULL, NULL );
+	TuiGuest_OutputLine( &(p_guest->t_info), "Disk Write IOPS", GUEST_LIMIT_DISK_WRITE_IOPS_KEY, 1,
+							"IOPS", 0x00, 0x00, NULL, NULL );
 
 	Guest_Release( p_guest );
 

--- a/src/tuiguest.h
+++ b/src/tuiguest.h
@@ -45,9 +45,22 @@ VMTUI_TUIGUEST_EXTERN int TuiGuest_Term( void );
 typedef	struct	{
 	int				i_attr;
 	DWord			dw_option;
-		#define	TUIGUEST_LINEATTR_NORMAL		0x00
-		#define	TUIGUEST_LINEATTR_ONLYVALUE		0x01
-	char			str_key[32];
+		#define	TUIGUEST_LINEATTR_NORMAL		 0x00000000
+		#define	TUIGUEST_LINEATTR_ONLYVALUE		 0x00000001
+		#define TUIGUEST_LINE_EDITABLE			 0x00000010
+		#define	TUIGUEST_LINE_DYNAMIC			(0x00000000|TUIGUEST_LINE_EDITABLE)
+		#define	TUIGUEST_LINE_STATIC			(0x00000020|TUIGUEST_LINE_EDITABLE)
+		#define	TUIGUEST_LINE_STRING			 0x00000000
+		#define	TUIGUEST_LINE_INTEGER			 0x00000100
+		#define	TUIGUEST_LINE_DECIMAL			(0x00000200|TUIGUEST_LINE_INTEGER)
+		#define	TUIGUEST_LINE_IPADDR			(0x00000200|TUIGUEST_LINE_INTEGER)
+		#define	TUIGUEST_LINE_SFXINT			 0x00000400
+		#define	TUIGUEST_LINE_PASSWORD			 0x00000800
+		#define	TUIGUEST_LINE_YESNO				 0x00001000
+		#define	TUIGUEST_LINE_SELECT			 0x00002000
+	char			str_key[KEYVAL_MAXLEN_KEY];
+	ConfFile_SelectValue	*pt_select;
+	ConfFile_CheckValue		pf_check;
 } TuiGuest_LineAttr;
 
 static	struct	{

--- a/src/tuikey.c
+++ b/src/tuikey.c
@@ -139,9 +139,7 @@ char *
 	TuiKey_GetInputStringAndPasswd(
 		int	*pi_len, int *pi_cursor )
 {
-	if(( TUIKEY_MODE_INPUTSTR != gi_keymode ) && ( TUIKEY_MODE_INPUTPASSWD != gi_keymode ))	{
-		return NULL;
-	}
+	if( ! (TUIKEY_MODE_INPUTSTR & gi_keymode ))	{ return NULL; }
 
 	if( NULL != pi_len )
 		{ *pi_len	= gt_input.i_inputlen; }
@@ -215,7 +213,7 @@ int
 		if( NULL != pstr_msg )
 			{ strncpy( gt_input.str_msg, pstr_msg, sizeof( gt_input.str_msg ) ); }
 		else	{
-			if( TUIKEY_MODE_INPUTINT == i_mode )
+			if( TUIKEY_MODE_INPUTINTEGER == 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 ) ); }
@@ -406,7 +404,7 @@ int
 		{ 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 )	{
+	else if( TUIKEY_MODE_INPUTINTEGER == gi_keymode )	{
 		if( isdigit( i_key ) )	{ goto	goto_TuiKey_Dispatch_Mode_InputStr_OK; }
 	}
 	else if(( TUIKEY_MODE_INPUTDECIMAL == gi_keymode )
@@ -512,6 +510,10 @@ int
 				i_exit	= TuiConsole_Dispatch( i_key );
 				break;
 			case TUIKEY_MODE_INPUTSTR:
+			case TUIKEY_MODE_INPUTINTEGER:
+			case TUIKEY_MODE_INPUTDECIMAL:
+			//case TUIKEY_MODE_INPUTIPADDR:
+			case TUIKEY_MODE_INPUTSFXINT:
 			case TUIKEY_MODE_INPUTPASSWD:
 				i_exit	= TuiKey_Dispatch_Mode_InputStr( i_key );
 				break;

--- a/src/tuikey.h
+++ b/src/tuikey.h
@@ -62,7 +62,7 @@ VMTUI_TUIKEY_EXTERN int TuiKey_Term( void );
 #define	TUIKEY_MODE_CONSOLE			(0x03+TUIKEY_MODE_INFO)
 #define	TUIKEY_MODE_ERRINFO			(0x04+TUIKEY_MODE_INFO)
 #define	TUIKEY_MODE_INPUTSTR		0x20
-#define	TUIKEY_MODE_INPUTINT		0x21	// bit 1 : digit
+#define	TUIKEY_MODE_INPUTINTEGER	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