mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-25 11:53:24 +00:00
Better Unicode support in the console
This was SVN commit r1038.
This commit is contained in:
@@ -279,9 +279,11 @@ bool ScriptingHost::ValueToBool(const jsval value)
|
||||
|
||||
std::string ScriptingHost::ValueToString(const jsval value)
|
||||
{
|
||||
JSString * string = JS_ValueToString(m_Context, value);
|
||||
JSString* string = JS_ValueToString(m_Context, value);
|
||||
if (string == NULL)
|
||||
throw PSERROR_Scripting_ConversionFailed();
|
||||
|
||||
char * bytes = JS_GetStringBytes(string);
|
||||
char* bytes = JS_GetStringBytes(string);
|
||||
if (bytes == NULL)
|
||||
throw PSERROR_Scripting_ConversionFailed();
|
||||
|
||||
@@ -290,8 +292,15 @@ std::string ScriptingHost::ValueToString(const jsval value)
|
||||
|
||||
CStrW ScriptingHost::ValueToUCString( const jsval value )
|
||||
{
|
||||
JSString* string = JS_ValueToString( m_Context, value );
|
||||
return( CStrW( JS_GetStringChars( string ) ) );
|
||||
JSString* string = JS_ValueToString(m_Context, value);
|
||||
if (string == NULL)
|
||||
throw PSERROR_Scripting_ConversionFailed();
|
||||
|
||||
jschar* chars = JS_GetStringChars(string);
|
||||
if (chars == NULL)
|
||||
throw PSERROR_Scripting_ConversionFailed();
|
||||
|
||||
return CStrW(chars);
|
||||
}
|
||||
|
||||
jsval ScriptingHost::UCStringToValue(const utf16string &str)
|
||||
|
||||
Reference in New Issue
Block a user