Merge pull request #4 from mlandres/master

link against libncursesw.6  to have widechar and thread support

PROJECTINFO.cmake

@@ -6,9 +6,18 @@ SET( BASELIB		"yui" )		# don't change this
 
 SET( SUBDIRS		src )
 SET( PLUGINNAME		"ncurses" )
-SET( LIB_DEPS		Curses )
+SET( LIB_DEPS		)
 SET( INTERNAL_DEPS	Libyui )
-SET( LIB_LINKER		ncurses ncursesw panelw )
+SET( LIB_LINKER		)
 SET( URL		"http://github.com/libyui/" )
 SET( SUMMARY		"Libyui - Character Based User Interface" )
 SET( DESCRIPTION	"This package contains the character based (ncurses) user interface\ncomponent for libYUI.\n" )
+
+# using ncurses6:
+SET ( NCURSES_CFLAGS	"-I/usr/include/ncurses6" )
+SET ( NCURSES_LIBS	"-L/usr/lib64/ncurses6 -lncursesw -lpanelw" )
+
+SET ( CMAKE_CXX_FLAGS	"${NCURSES_CFLAGS} ${CMAKE_CXX_FLAGS}" )
+SET ( CMAKE_C_FLAGS	"${NCURSES_CFLAGS} ${CMAKE_C_FLAGS}" )
+SET ( CMAKE_SHARED_LINKER_FLAGS	"${NCURSES_LIBS} ${CMAKE_SHARED_LINKER_FLAGS}" )
+ADD_DEFINITIONS( "-DNCURSES_INTERNALS=1" )

src/YNCursesUI.cc

@@ -65,23 +65,20 @@ YNCursesUI::YNCursesUI( bool withThreads )
 
     if ( getenv( "LANG" ) != NULL )
     {
+	setlocale ( LC_CTYPE, "" );
 	string language = getenv( "LANG" );
 	string encoding =  nl_langinfo( CODESET );
-
-	// setlocale ( LC_ALL, "" ) is called in WMFInterpreter::WFMInterpreter;
+	yuiMilestone() << "getenv LANG: " << language << " encoding: " << encoding << std::endl;
 
 	// Explicitly set LC_CTYPE so that it won't be changed if setenv( LANG ) is called elsewhere.
 	// (it's not enough to call setlocale( LC_CTYPE, .. ), set env. variable LC_CTYPE!)
-
 	string locale = setlocale( LC_CTYPE, NULL );
 	setenv( "LC_CTYPE", locale.c_str(), 1 );
-
 	yuiMilestone() << "setenv LC_CTYPE: " << locale << " encoding: " << encoding << std::endl;
 
 	// The encoding of a terminal (xterm, konsole etc.) can never change; the encoding
 	// of the "real" console is changed in setConsoleFont().
 	NCstring::setTerminalEncoding( encoding );
-
 	app()->setLanguage( language, encoding );
     }