Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-29 05:12:41 +00:00
Code Issues Releases Activity

Use isutf()

Browse Source
This commit is contained in:
Nikolas Garofil 2010-02-25 07:07:00 +01:00
parent 6c25f335c4
commit cb11cf675a
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/conky.cc
View File

@ -403,7 +403,7 @@ unsigned int max_user_text;
unsigned int text_buffer_size = DEFAULT_TEXT_BUFFER_SIZE; unsigned int text_buffer_size = DEFAULT_TEXT_BUFFER_SIZE;
/* UTF-8 */ /* UTF-8 */
int utf8_mode = 0; bool utf8_mode = false;
/* no buffers in used memory? */ /* no buffers in used memory? */
int no_buffers; int no_buffers;
@ -2458,19 +2458,19 @@ void clean_up(void *memtofree1, void* memtofree2)
free_and_zero(global_cpu); free_and_zero(global_cpu);
} }
static int string_to_bool(const char *s) static bool string_to_bool(const char *s)
{ {
if (!s) { if (!s) {
// Assumes an option without a true/false means true // Assumes an option without a true/false means true
return 1; return true;
} else if (strcasecmp(s, "yes") == EQUAL) { } else if (strcasecmp(s, "yes") == EQUAL) {
return 1; return true;
} else if (strcasecmp(s, "true") == EQUAL) { } else if (strcasecmp(s, "true") == EQUAL) {
return 1; return true;
} else if (strcasecmp(s, "1") == EQUAL) { } else if (strcasecmp(s, "1") == EQUAL) {
return 1; return true;
} }
return 0; return false;
} }
#ifdef BUILD_X11 #ifdef BUILD_X11
@ -4195,12 +4195,22 @@ void initialisation(int argc, char **argv) {
#endif /* BUILD_LUA */ #endif /* BUILD_LUA */
} }
int main(int argc, char **argv)
{
#ifdef BUILD_X11 #ifdef BUILD_X11
char *s; bool isutf8(const char* envvar) {
char *s = getenv(envvar);
if(s) {
std::string temp = s;
std::transform(temp.begin(), temp.end(), temp.begin(), ::tolower);
if( (temp.find("utf-8") != std::string::npos) || (temp.find("utf8") != std::string::npos) ) {
return true;
}
}
return false;
}
#endif #endif
int main(int argc, char **argv)
{
argc_copy = argc; argc_copy = argc;
argv_copy = argv; argv_copy = argv;
g_signal_pending = 0; g_signal_pending = 0;
@ -4217,13 +4227,8 @@ int main(int argc, char **argv)
/* handle command line parameters that don't change configs */ /* handle command line parameters that don't change configs */
#ifdef BUILD_X11 #ifdef BUILD_X11
if (((s = getenv("LC_ALL")) && *s) || ((s = getenv("LC_CTYPE")) && *s) if(isutf8("LC_ALL") || isutf8("LC_CTYPE") || isutf8("LANG")) {
|| ((s = getenv("LANG")) && *s)) { utf8_mode = true;
std::string temp = s;
std::transform(temp.begin(), temp.end(), temp.begin(), ::tolower);
if( (temp.find("utf-8") != std::string::npos) || (temp.find("utf8") != std::string::npos) ) {
utf8_mode = 1;
}
} }
if (!setlocale(LC_CTYPE, "")) { if (!setlocale(LC_CTYPE, "")) {
NORM_ERR("Can't set the specified locale!\nCheck LANG, LC_CTYPE, LC_ALL."); NORM_ERR("Can't set the specified locale!\nCheck LANG, LC_CTYPE, LC_ALL.");