[R] Reversed changes
This commit is contained in:
		@@ -3,12 +3,6 @@
 | 
			
		||||
#include <wchar.h>
 | 
			
		||||
#include <locale.h>
 | 
			
		||||
 | 
			
		||||
//#ifdef FT_MICROSOFT_COMPILER
 | 
			
		||||
//#include <fcntl.h>
 | 
			
		||||
//#include <io.h>
 | 
			
		||||
//#endif
 | 
			
		||||
#include "wcwidth.h"
 | 
			
		||||
 | 
			
		||||
static FTABLE *create_basic_table()
 | 
			
		||||
{
 | 
			
		||||
    FTABLE *table = ft_create_table();
 | 
			
		||||
@@ -27,56 +21,10 @@ static FTABLE *create_basic_table()
 | 
			
		||||
    return table;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
int main()
 | 
			
		||||
{
 | 
			
		||||
    FTABLE *table = NULL;
 | 
			
		||||
 | 
			
		||||
#ifdef FT_HAVE_WCHAR
 | 
			
		||||
 | 
			
		||||
//#ifdef FT_MICROSOFT_COMPILER
 | 
			
		||||
//    _setmode(_fileno(stdout), _O_U16TEXT);
 | 
			
		||||
//#else
 | 
			
		||||
    setlocale(LC_CTYPE, "");
 | 
			
		||||
//#endif
 | 
			
		||||
 | 
			
		||||
    table = ft_create_table();
 | 
			
		||||
    ft_set_option(table, FT_ANY_ROW, 0, FT_OPT_TEXT_ALIGN, CenterAligned);
 | 
			
		||||
    ft_set_option(table, FT_ANY_ROW, 1, FT_OPT_TEXT_ALIGN, LeftAligned);
 | 
			
		||||
 | 
			
		||||
    ft_set_option(table, 0, FT_ANY_COLUMN, FT_OPT_ROW_TYPE, Header);
 | 
			
		||||
    /*
 | 
			
		||||
    FT_NWWRITE_LN(table, L"Rank", L"Title", L"Year", L"Rating");
 | 
			
		||||
 | 
			
		||||
    FT_NWWRITE_LN(table, L"1", L"Побег из Шоушенка", L"1994", L"9.5");
 | 
			
		||||
    FT_NWWRITE_LN(table, L"2", L"12 разгневанных мужчин", L"1957", L"8.8");
 | 
			
		||||
    FT_NWWRITE_LN(table, L"3", L"Космическая одиссея 2001 года", L"1968", L"8.5");
 | 
			
		||||
    FT_NWWRITE_LN(table, L"4", L"Бегущий по лезвию", L"1982", L"8.1");
 | 
			
		||||
    */
 | 
			
		||||
 | 
			
		||||
    /* Ранг | Название | Год | Рейтинг */
 | 
			
		||||
    FT_NWWRITE_LN(table, L"\x420\x430\x43d\x433", L"\x41d\x430\x437\x432\x430\x43d\x438\x435", L"\x413\x43e\x434", L"\x420\x435\x439\x442\x438\x43d\x433");
 | 
			
		||||
 | 
			
		||||
    FT_NWWRITE_LN(table, L"1", L"\x41f\x43e\x431\x435\x433 \x438\x437 \x428\x43e\x443\x448\x435\x43d\x43a\x430", L"1994", L"9.5"); /* Побег из Шоушенка */
 | 
			
		||||
    FT_NWWRITE_LN(table, L"2", L"12 \x440\x430\x437\x433\x43d\x435\x432\x430\x43d\x43d\x44b\x445 \x43c\x443\x436\x447\x438\x43d", L"1957", L"8.8"); /* 12 разгневанных мужчин */
 | 
			
		||||
    FT_NWWRITE_LN(table, L"3", L"\x41a\x43e\x441\x43c\x438\x447\x435\x441\x43a\x430\x44f \x43e\x434\x438\x441\x441\x435\x44f 2001 \x433\x43e\x434\x430", L"1968", L"8.5"); /* Космическая одиссея 2001 года */
 | 
			
		||||
    FT_NWWRITE_LN(table, L"4", L"\x411\x435\x433\x443\x449\x438\x439 \x43f\x43e \x43b\x435\x437\x432\x438\x44e", L"1982", L"8.1"); /* Бегущий по лезвию */
 | 
			
		||||
 | 
			
		||||
    fwprintf(stderr, L"Table:\n%ls\n ", ft_to_wstring(table));
 | 
			
		||||
 | 
			
		||||
    ft_destroy_table(table);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    /*-------------------------------------------------------------*/
 | 
			
		||||
    table = ft_create_table();
 | 
			
		||||
    ft_set_option(table, FT_ANY_ROW, 0, FT_OPT_TEXT_ALIGN, CenterAligned);
 | 
			
		||||
    ft_set_option(table, FT_ANY_ROW, 1, FT_OPT_TEXT_ALIGN, LeftAligned);
 | 
			
		||||
@@ -195,6 +143,36 @@ int main()
 | 
			
		||||
    printf("Table:\n%s\n", ft_to_string(table));
 | 
			
		||||
    ft_destroy_table(table);
 | 
			
		||||
 | 
			
		||||
    /*-------------------------------------------------------------*/
 | 
			
		||||
#ifdef FT_HAVE_WCHAR
 | 
			
		||||
    setlocale(LC_CTYPE, "");
 | 
			
		||||
 | 
			
		||||
    table = ft_create_table();
 | 
			
		||||
    ft_set_option(table, FT_ANY_ROW, 0, FT_OPT_TEXT_ALIGN, CenterAligned);
 | 
			
		||||
    ft_set_option(table, FT_ANY_ROW, 1, FT_OPT_TEXT_ALIGN, LeftAligned);
 | 
			
		||||
 | 
			
		||||
    ft_set_option(table, 0, FT_ANY_COLUMN, FT_OPT_ROW_TYPE, Header);
 | 
			
		||||
    FT_NWWRITE_LN(table, L"Ранг", L"Название", L"Год", L"Рейтинг");
 | 
			
		||||
 | 
			
		||||
    FT_NWWRITE_LN(table, L"1", L"Побег из Шоушенка", L"1994", L"9.5");
 | 
			
		||||
    FT_NWWRITE_LN(table, L"2", L"12 разгневанных мужчин", L"1957", L"8.8");
 | 
			
		||||
    FT_NWWRITE_LN(table, L"3", L"Космическая одиссея 2001 года", L"1968", L"8.5");
 | 
			
		||||
    FT_NWWRITE_LN(table, L"4", L"Бегущий по лезвию", L"1982", L"8.1");
 | 
			
		||||
 | 
			
		||||
    /* Ранг | Название | Год | Рейтинг */
 | 
			
		||||
    /*FT_NWWRITE_LN(table, L"\x420\x430\x43d\x433", L"\x41d\x430\x437\x432\x430\x43d\x438\x435", L"\x413\x43e\x434", L"\x420\x435\x439\x442\x438\x43d\x433");
 | 
			
		||||
 | 
			
		||||
    /*FT_NWWRITE_LN(table, L"1", L"\x41f\x43e\x431\x435\x433 \x438\x437 \x428\x43e\x443\x448\x435\x43d\x43a\x430", L"1994", L"9.5");*/ /* Побег из Шоушенка */
 | 
			
		||||
    /*FT_NWWRITE_LN(table, L"2", L"12 \x440\x430\x437\x433\x43d\x435\x432\x430\x43d\x43d\x44b\x445 \x43c\x443\x436\x447\x438\x43d", L"1957", L"8.8");*/ /* 12 разгневанных мужчин */
 | 
			
		||||
    /*FT_NWWRITE_LN(table, L"3", L"\x41a\x43e\x441\x43c\x438\x447\x435\x441\x43a\x430\x44f \x43e\x434\x438\x441\x441\x435\x44f 2001 \x433\x43e\x434\x430", L"1968", L"8.5");*/ /* Космическая одиссея 2001 года */
 | 
			
		||||
    /*FT_NWWRITE_LN(table, L"4", L"\x411\x435\x433\x443\x449\x438\x439 \x43f\x43e \x43b\x435\x437\x432\x438\x44e", L"1982", L"8.1");*/ /* Бегущий по лезвию */
 | 
			
		||||
 | 
			
		||||
    fwprintf(stderr, L"Table:\n%ls\n ", ft_to_wstring(table));
 | 
			
		||||
 | 
			
		||||
    ft_destroy_table(table);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    table = NULL;
 | 
			
		||||
 | 
			
		||||
    return 0;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user