ec99f3b2a6
* make room in mbstate_t for containing an ICU-converter's state (well, in fact the whole converter object) * adjust libroot's locale add-on to clone converters into a given mbstate_t directly * adjust ICUThreadLocalStorageValue to contain the converter pointer instead of a converter-ID (if the converter is related to an mbstate_t, it points into the mbstate_t). * adjust users of converters to directly use converter pointers instead of ICUConverterRef * drop now unused ICUConverterManager and ICUConverterRef * update gcc4 optional package This brings our multibyte implementation into a fully working state, both non-ascii and non-8-bit characters can now be handled normally in the Terminal, i.e. this finally fixes #6276. N.B.: Since the size of mbstate_t has changed, everything (including the compiler!) needs to be rebuilt.
60 lines
1.3 KiB
C++
60 lines
1.3 KiB
C++
/*
|
|
* Copyright 2010-2011, Oliver Tappe, zooey@hirschkaefer.de.
|
|
* Distributed under the terms of the MIT License.
|
|
*/
|
|
#ifndef _ICU_CATEGORY_DATA_H
|
|
#define _ICU_CATEGORY_DATA_H
|
|
|
|
#include <pthread.h>
|
|
|
|
#include <unicode/locid.h>
|
|
#include <unicode/unistr.h>
|
|
|
|
#include <SupportDefs.h>
|
|
|
|
#include "ICUThreadLocalStorageValue.h"
|
|
|
|
|
|
namespace BPrivate {
|
|
namespace Libroot {
|
|
|
|
|
|
class ICUCategoryData {
|
|
public:
|
|
ICUCategoryData(pthread_key_t tlsKey);
|
|
virtual ~ICUCategoryData();
|
|
|
|
virtual status_t SetTo(const Locale& locale,
|
|
const char* posixLocaleName);
|
|
virtual status_t SetToPosix();
|
|
|
|
const char* PosixLocaleName()
|
|
{ return fPosixLocaleName; }
|
|
|
|
protected:
|
|
status_t _ConvertUnicodeStringToLocaleconvEntry(
|
|
const UnicodeString& string,
|
|
char* destination, int destinationSize,
|
|
const char* defaultValue = "");
|
|
|
|
status_t _GetConverter(UConverter*& converterOut);
|
|
|
|
static const uint16 skMaxPosixLocaleNameLen = 128;
|
|
static const size_t skLCBufSize = 16;
|
|
|
|
pthread_key_t fThreadLocalStorageKey;
|
|
Locale fLocale;
|
|
char fPosixLocaleName[skMaxPosixLocaleNameLen];
|
|
char fGivenCharset[UCNV_MAX_CONVERTER_NAME_LENGTH];
|
|
|
|
private:
|
|
status_t _SetupConverter();
|
|
};
|
|
|
|
|
|
} // namespace Libroot
|
|
} // namespace BPrivate
|
|
|
|
|
|
#endif // _ICU_CATEGORY_DATA_H
|