disable detecting currently used encoding as it's extremely ugly

src/charset.cpp

@@ -29,13 +29,11 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "locale.h"
+#include "settings.h"
 #include "str_pool.h"
 
 namespace
 {
-	char *locale_charset = 0;
-
 	inline bool char_non_ascii(char ch)
 	{
 		return (ch & 0x80) != 0;
@@ -89,55 +87,12 @@ namespace
 	}
 }
 
-void init_current_locale()
-{
-	if (!setlocale(LC_CTYPE, ""))
-		return;
-	std::string envlocale = setlocale(LC_CTYPE, "");
-	if (envlocale.empty() || envlocale == "C")
-		return;
-	std::ifstream f(ENCODINGS);
-	if (!f.is_open())
-	{
-		std::cerr << "ncmpcpp: cannot open file "ENCODINGS"!\n";
-		return;
-	}
-	envlocale += " ";
-	std::string line;
-	while (!f.eof())
-	{
-		getline(f, line);
-		if (line.find(envlocale) != std::string::npos)
-		{
-			try
-			{
-				std::string charset = line.substr(line.find(" ")+1);
-				if (charset == "UTF-8"
-				||  charset == "utf-8"
-				||  charset == "utf8")
-				{
-					f.close();
-					return;
-				}
-				locale_charset = strdup((charset + "//TRANSLIT").c_str());
-			}
-			catch (std::out_of_range)
-			{
-				f.close();
-				return;
-			}
-			break;
-		}
-	}
-	f.close();
-}
-
 void utf_to_locale(std::string &s)
 {
-	if (s.empty() || !locale_charset || !has_non_ascii_chars(s))
+	if (s.empty() || Config.system_encoding.empty() || !has_non_ascii_chars(s))
 		return;
 	char *tmp = str_pool_get(s.c_str());
-	charset_convert("utf8", locale_charset, tmp, s.length());
+	charset_convert("utf8", Config.system_encoding.c_str(), tmp, s.length());
 	s = tmp;
 	str_pool_put(tmp);
 }
@@ -151,10 +106,10 @@ std::string utf_to_locale_cpy(const std::string &s)
 
 void locale_to_utf(std::string &s)
 {
-	if (s.empty() || !locale_charset || !has_non_ascii_chars(s))
+	if (s.empty() || Config.system_encoding.empty() || !has_non_ascii_chars(s))
 		return;
 	char *tmp = str_pool_get(s.c_str());
-	charset_convert(locale_charset, "utf8", tmp, s.length());
+	charset_convert(Config.system_encoding.c_str(), "utf8", tmp, s.length());
 	s = tmp;
 	str_pool_put(tmp);
 }
@@ -168,16 +123,16 @@ std::string locale_to_utf_cpy(const std::string &s)
 
 void str_pool_utf_to_locale(char *&s)
 {
-	if (!s || !locale_charset || !has_non_ascii_chars(s))
+	if (!s || Config.system_encoding.empty() || !has_non_ascii_chars(s))
 		return;
-	charset_convert("utf8", locale_charset, s);
+	charset_convert("utf8", Config.system_encoding.c_str(), s);
 }
 
 void str_pool_locale_to_utf(char *&s)
 {
-	if (!s || !locale_charset || !has_non_ascii_chars(s))
+	if (!s || Config.system_encoding.empty() || !has_non_ascii_chars(s))
 		return;
-	charset_convert(locale_charset, "utf8", s);
+	charset_convert(Config.system_encoding.c_str(), "utf8", s);
 }
 
 #endif // HAVE_ICONV_H

src/charset.h

@@ -29,8 +29,6 @@
 
 #include <string>
 
-void init_current_locale();
-
 void utf_to_locale(std::string &);
 void locale_to_utf(std::string &);
 
@@ -42,8 +40,6 @@ void str_pool_locale_to_utf(char *&);
 
 #else
 
-#define init_current_locale();
-
 #define utf_to_locale(x);
 #define locale_to_utf(x);
 

src/ncmpcpp.cpp

@@ -118,7 +118,6 @@ int main(int argc, char *argv[])
 	std::cerr.rdbuf(errorlog.rdbuf());
 	
 	InitScreen("ncmpc++ ver. "VERSION, Config.colors_enabled);
-	init_current_locale();
 	
 	MainStartY = 2;
 	MainHeight = LINES-4;

src/settings.cpp

@@ -528,6 +528,11 @@ void ReadConfiguration(ncmpcpp_config &conf)
 				if (!v.empty())
 					conf.external_editor = v;
 			}
+			else if (cl.find("system_encoding") != string::npos)
+			{
+				if (!v.empty())
+					conf.system_encoding = v + "//TRANSLIT";
+			}
 			else if (cl.find("browser_playlist_prefix") != string::npos)
 			{
 				if (!v.empty())

src/settings.h

@@ -111,6 +111,7 @@ struct ncmpcpp_config
 	std::string song_library_format;
 	std::string tag_editor_album_format;
 	std::string external_editor;
+	std::string system_encoding;
 	
 	std::string pattern;