///////////////////////////////////////////////////////////////////////////////
-// Name: common/fmapbase.cpp
+// Name: src/common/fmapbase.cpp
// Purpose: wxFontMapperBase class implementation
// Author: Vadim Zeitlin
// Modified by:
#include "wx/app.h"
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/module.h"
+ #include "wx/wxcrtvararg.h"
#endif //WX_PRECOMP
#if defined(__WXMSW__)
- #include "wx/msw/private.h" // includes windows.h for LOGFONT
- #include "wx/msw/winundef.h"
+ #include "wx/msw/private.h" // includes windows.h for LOGFONT
+ #include "wx/msw/winundef.h"
#endif
#include "wx/fontmap.h"
#include "wx/fmappriv.h"
#include "wx/apptrait.h"
-#include "wx/module.h"
// wxMemoryConfig uses wxFileConfig
#if wxUSE_CONFIG && wxUSE_FILECONFIG
wxFONTENCODING_CP437,
wxFONTENCODING_UTF7,
wxFONTENCODING_UTF8,
- wxFONTENCODING_UTF16,
wxFONTENCODING_UTF16BE,
wxFONTENCODING_UTF16LE,
- wxFONTENCODING_UTF32,
wxFONTENCODING_UTF32BE,
wxFONTENCODING_UTF32LE,
wxFONTENCODING_EUC_JP,
wxFONTENCODING_BIG5,
wxFONTENCODING_SHIFT_JIS,
wxFONTENCODING_GB2312,
+ wxFONTENCODING_ISO2022_JP,
};
// the descriptions for them
-static const wxChar* gs_encodingDescs[] =
+static const char* gs_encodingDescs[] =
{
wxTRANSLATE( "Western European (ISO-8859-1)" ),
wxTRANSLATE( "Central European (ISO-8859-2)" ),
wxTRANSLATE( "Windows/DOS OEM (CP 437)" ),
wxTRANSLATE( "Unicode 7 bit (UTF-7)" ),
wxTRANSLATE( "Unicode 8 bit (UTF-8)" ),
+#ifdef WORDS_BIGENDIAN
wxTRANSLATE( "Unicode 16 bit (UTF-16)" ),
- wxTRANSLATE( "Unicode 16 bit Big Endian (UTF-16BE)" ),
wxTRANSLATE( "Unicode 16 bit Little Endian (UTF-16LE)" ),
wxTRANSLATE( "Unicode 32 bit (UTF-32)" ),
- wxTRANSLATE( "Unicode 32 bit Big Endian (UTF-32BE)" ),
wxTRANSLATE( "Unicode 32 bit Little Endian (UTF-32LE)" ),
+#else // WORDS_BIGENDIAN
+ wxTRANSLATE( "Unicode 16 bit Big Endian (UTF-16BE)" ),
+ wxTRANSLATE( "Unicode 16 bit (UTF-16)" ),
+ wxTRANSLATE( "Unicode 32 bit Big Endian (UTF-32BE)" ),
+ wxTRANSLATE( "Unicode 32 bit (UTF-32)" ),
+#endif // WORDS_BIGENDIAN
wxTRANSLATE( "Extended Unix Codepage for Japanese (EUC-JP)" ),
wxTRANSLATE( "US-ASCII" ),
wxTRANSLATE( "BIG5" ),
wxTRANSLATE( "SHIFT-JIS" ),
wxTRANSLATE( "GB-2312" ),
+ wxTRANSLATE( "ISO-2022-JP" ),
};
// and the internal names (these are not translated on purpose!)
-static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][10] =
+static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] =
{
// names from the columns correspond to these OS:
// Linux Solaris and IRIX HP-UX AIX
{ wxT( "KOI8-R" ), wxT( "KOI8-RU" ), NULL },
{ wxT( "KOI8-U" ), NULL },
- { wxT( "WINDOWS-874" ), wxT( "CP-874" ), NULL },
- { wxT( "WINDOWS-932" ), wxT( "CP-932" ), NULL },
- { wxT( "WINDOWS-936" ), wxT( "CP-936" ), NULL },
- { wxT( "WINDOWS-949" ), wxT( "CP-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL },
- { wxT( "WINDOWS-950" ), wxT( "CP-950" ), NULL },
- { wxT( "WINDOWS-1250" ),wxT( "CP-1250" ), NULL },
- { wxT( "WINDOWS-1251" ),wxT( "CP-1251" ), NULL },
- { wxT( "WINDOWS-1252" ),wxT( "CP-1252" ), wxT("IBM-1252"), NULL },
- { wxT( "WINDOWS-1253" ),wxT( "CP-1253" ), NULL },
- { wxT( "WINDOWS-1254" ),wxT( "CP-1254" ), NULL },
- { wxT( "WINDOWS-1255" ),wxT( "CP-1255" ), NULL },
- { wxT( "WINDOWS-1256" ),wxT( "CP-1256" ), NULL },
- { wxT( "WINDOWS-1257" ),wxT( "CP-1257" ), NULL },
- { wxT( "WINDOWS-437" ), wxT( "CP-437" ), NULL },
-
- { wxT( "UTF-7" ), wxT("utf7"), NULL },
- { wxT( "UTF-8" ), wxT("utf8"), NULL },
- { wxT( "UTF-16" ), wxT("UCS-2"), wxT("UCS2"), NULL },
- { wxT( "UTF-16BE" ), wxT("UCS-2BE"), NULL },
+ { wxT( "WINDOWS-874" ), wxT( "CP-874" ), wxT( "MS-874" ), wxT( "IBM-874" ), NULL },
+ { wxT( "WINDOWS-932" ), wxT( "CP-932" ), wxT( "MS-932" ), wxT( "IBM-932" ), NULL },
+ { wxT( "WINDOWS-936" ), wxT( "CP-936" ), wxT( "MS-936" ), wxT( "IBM-936" ), NULL },
+ { wxT( "WINDOWS-949" ), wxT( "CP-949" ), wxT( "MS-949" ), wxT( "IBM-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL },
+ { wxT( "WINDOWS-950" ), wxT( "CP-950" ), wxT( "MS-950" ), wxT( "IBM-950" ), NULL },
+ { wxT( "WINDOWS-1250" ),wxT( "CP-1250" ),wxT( "MS-1250" ),wxT( "IBM-1250" ),NULL },
+ { wxT( "WINDOWS-1251" ),wxT( "CP-1251" ),wxT( "MS-1251" ),wxT( "IBM-1251" ),NULL },
+ { wxT( "WINDOWS-1252" ),wxT( "CP-1252" ),wxT( "MS-1252" ),wxT( "IBM-1252" ),NULL },
+ { wxT( "WINDOWS-1253" ),wxT( "CP-1253" ),wxT( "MS-1253" ),wxT( "IBM-1253" ),NULL },
+ { wxT( "WINDOWS-1254" ),wxT( "CP-1254" ),wxT( "MS-1254" ),wxT( "IBM-1254" ),NULL },
+ { wxT( "WINDOWS-1255" ),wxT( "CP-1255" ),wxT( "MS-1255" ),wxT( "IBM-1255" ),NULL },
+ { wxT( "WINDOWS-1256" ),wxT( "CP-1256" ),wxT( "MS-1256" ),wxT( "IBM-1256" ),NULL },
+ { wxT( "WINDOWS-1257" ),wxT( "CP-1257" ),wxT( "MS-1257" ),wxT( "IBM-1257" ),NULL },
+ { wxT( "WINDOWS-437" ), wxT( "CP-437" ), wxT( "MS-437" ), wxT( "IBM-437" ), NULL },
+
+ { wxT( "UTF-7" ), NULL },
+ { wxT( "UTF-8" ), NULL },
+#ifdef WORDS_BIGENDIAN
+ { wxT( "UTF-16BE" ), wxT("UCS-2BE"), wxT( "UTF-16" ), wxT("UCS-2"), NULL },
{ wxT( "UTF-16LE" ), wxT("UCS-2LE"), NULL },
- { wxT( "UTF-32" ), wxT( "UCS-4" ), wxT("UCS4"), NULL },
- { wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), NULL },
+ { wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), wxT( "UTF-32" ), wxT( "UCS-4" ), NULL },
{ wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), NULL },
+#else // WORDS_BIGENDIAN
+ { wxT( "UTF-16BE" ), wxT("UCS-2BE"), NULL },
+ { wxT( "UTF-16LE" ), wxT("UCS-2LE"), wxT( "UTF-16" ), wxT("UCS-2"), NULL },
+ { wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), NULL },
+ { wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), wxT( "UTF-32" ), wxT( "UCS-4" ), NULL },
+#endif // WORDS_BIGENDIAN
{ wxT( "EUC-JP" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL },
{ wxT( "BIG5" ), wxT("big5"), NULL },
{ wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL },
{ wxT( "GB2312" ), NULL },
+ { wxT( "ISO-2022-JP" ), NULL },
};
wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );
{
public:
wxFontMapperModule() : wxModule() { }
- virtual bool OnInit() { return true; }
- virtual void OnExit() { delete (wxFontMapperBase*)wxFontMapperBase::Set(NULL); }
+
+ virtual bool OnInit()
+ {
+ // a dummy wxFontMapperBase object could have been created during the
+ // program startup before wxApp was created, we have to delete it to
+ // allow creating the real font mapper next time it is needed now that
+ // we can create it (when the modules are initialized, wxApp object
+ // already exists)
+ wxFontMapperBase *fm = wxFontMapperBase::Get();
+ if ( fm && fm->IsDummy() )
+ wxFontMapperBase::Reset();
+
+ return true;
+ }
+
+ virtual void OnExit()
+ {
+ wxFontMapperBase::Reset();
+ }
DECLARE_DYNAMIC_CLASS(wxFontMapperModule)
};
#endif // wxUSE_CONFIG
}
-bool wxFontMapperBase::IsWxFontMapper()
-{ return false; }
-
/* static */
wxFontMapperBase *wxFontMapperBase::Get()
{
return old;
}
+/* static */
+void wxFontMapperBase::Reset()
+{
+ if ( sm_instance )
+ {
+ // we need a cast as wxFontMapper is not fully declared here and so the
+ // compiler can't know that it derives from wxFontMapperBase (but
+ // run-time behaviour will be correct because the dtor is virtual)
+ delete (wxFontMapperBase *)sm_instance;
+ sm_instance = NULL;
+ }
+}
+
#if wxUSE_CONFIG && wxUSE_FILECONFIG
// ----------------------------------------------------------------------------
// config usage customisation
// ----------------------------------------------------------------------------
+
+static wxString gs_defaultConfigPath(FONTMAPPER_ROOT_PATH);
+
/* static */
-const wxChar *wxFontMapperBase::GetDefaultConfigPath()
+const wxString& wxFontMapperBase::GetDefaultConfigPath()
{
- return FONTMAPPER_ROOT_PATH;
+ // NB: we return const wxString& and not wxString for compatibility
+ // with 2.8 that returned const wxChar*
+ return gs_defaultConfigPath;
}
void wxFontMapperBase::SetConfigPath(const wxString& prefix)
{
- wxCHECK_RET( !prefix.IsEmpty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
+ wxCHECK_RET( !prefix.empty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
wxT("an absolute path should be given to wxFontMapper::SetConfigPath()") );
m_configRootPath = prefix;
*pathOld = config->GetPath();
wxString path = GetConfigPath();
- if ( path.IsEmpty() || path.Last() != wxCONFIG_PATH_SEPARATOR )
+ if ( path.empty() || path.Last() != wxCONFIG_PATH_SEPARATOR )
{
path += wxCONFIG_PATH_SEPARATOR;
}
config->SetPath(FONTMAPPER_CHARSET_ALIAS_PATH);
wxString alias = config->Read(charset);
- if ( !alias.IsEmpty() )
+ if ( !alias.empty() )
{
// yes, we do - use it instead
cs = alias;
}
}
- for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); ++i )
- {
- for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
- {
- if ( cs.CmpNoCase(*encName) == 0 )
- return gs_encodings[i];
- }
- }
+ // check for known encoding name
+ const wxFontEncoding e = GetEncodingFromName(cs);
+ if ( e != wxFONTENCODING_MAX )
+ return e;
+ // deal with general encoding names of the form FOO-xxx
cs.MakeUpper();
if ( cs.Left(3) == wxT("ISO") )
{
- // the dash is optional (or, to be exact, it is not, but
- // several brokenmails "forget" it)
+ // the dash is optional (or, to be exact, it is not, but many
+ // broken programs "forget" it in the output they generate)
const wxChar *p = cs.c_str() + 3;
if ( *p == wxT('-') )
p++;
- // printf( "iso %s\n", (const char*) cs.ToAscii() );
-
unsigned int value;
if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
{
- // printf( "value %d\n", (int)value );
-
// make it 0 based and check that it is strictly positive in
// the process (no such thing as iso8859-0 encoding)
if ( (value-- > 0) &&
unsigned int value;
if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
{
- // printf( "value %d\n", (int)value );
-
// make it 0 based and check that it is strictly positive in
// the process (no such thing as iso8859-0 encoding)
if ( (value-- > 0) &&
switch ( value )
{
+ case 866:
+ encoding = wxFONTENCODING_CP866;
+ break;
+
case 874:
encoding = wxFONTENCODING_CP874;
break;
{
const size_t count = WXSIZEOF(gs_encodingNames);
+ // many charsets use hyphens in their names but some systems use the
+ // same names without hyphens (e.g. "UTF-8" and "UTF8" are both common)
+ // so to avoid bloating gs_encodingNames array too much recognize both
+ // versions with and without hyphens here
+ wxString nameNoHyphens(name);
+ if ( !nameNoHyphens.Replace(_T("-"), _T("")) )
+ {
+ // no replacement has been done, no need to compare twice
+ nameNoHyphens.clear();
+ }
+
+
for ( size_t i = 0; i < count; i++ )
{
for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
{
- if ( name.CmpNoCase(*encName) == 0 )
+ if ( name.CmpNoCase(*encName) == 0 ||
+ (!nameNoHyphens.empty() &&
+ nameNoHyphens.CmpNoCase(*encName) == 0) )
+ {
return gs_encodings[i];
+ }
}
}
}
#endif // wxUSE_FONTMAP
-
projects / wxWidgets.git / blobdiff