From ea3c3be83dae12ef682c68fc7cf906d790fd9f84 Mon Sep 17 00:00:00 2001 From: npm Date: Mon, 19 Sep 2016 07:24:33 -0700 Subject: Remove duplicated charset definitions, and move them to fx_font.h PWL_FontMap does not need its own charset definitions. fx_edit.h does not need to define DEFAULT_CHARSET. XFA have their own definitions. They look different in that most are MAC or MSWin charset definitions. So they are left untouched. public/fpdf_sysfontinfo.h duplicate ones were left untouched due to being in public folder. Review-Url: https://codereview.chromium.org/2347313002 --- fpdfsdk/pdfwindow/PWL_Edit.cpp | 6 ++- fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | 7 +-- fpdfsdk/pdfwindow/PWL_FontMap.cpp | 90 ++++++++++++++++++++------------------ fpdfsdk/pdfwindow/PWL_FontMap.h | 27 ++---------- 4 files changed, 59 insertions(+), 71 deletions(-) (limited to 'fpdfsdk/pdfwindow') diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp index 4b115d345b..bd9d3aac61 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp @@ -15,6 +15,7 @@ #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/include/fx_font.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Caret.h" #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h" @@ -564,7 +565,7 @@ void CPWL_Edit::SetLimitChar(int32_t nLimitChar) { void CPWL_Edit::ReplaceSel(const CFX_WideString& wsText) { m_pEdit->Clear(); - m_pEdit->InsertText(wsText, DEFAULT_CHARSET); + m_pEdit->InsertText(wsText, FXFONT_DEFAULT_CHARSET); } CFX_FloatRect CPWL_Edit::GetFocusRect() const { @@ -708,7 +709,8 @@ FX_BOOL CPWL_Edit::OnChar(uint16_t nChar, uint32_t nFlag) { if (IPVT_FontMap* pFontMap = GetFontMap()) { int32_t nOldCharSet = GetCharSet(); - int32_t nNewCharSet = pFontMap->CharSetFromUnicode(nChar, DEFAULT_CHARSET); + int32_t nNewCharSet = + pFontMap->CharSetFromUnicode(nChar, FXFONT_DEFAULT_CHARSET); if (nOldCharSet != nNewCharSet) { SetCharSet(nNewCharSet); } diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp index 9d8b16a53c..2ec88cb15e 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp @@ -8,6 +8,7 @@ #include "core/fpdfdoc/include/cpvt_section.h" #include "core/fpdfdoc/include/cpvt_word.h" +#include "core/fxge/include/fx_font.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Caret.h" #include "fpdfsdk/pdfwindow/PWL_FontMap.h" @@ -20,7 +21,7 @@ CPWL_EditCtrl::CPWL_EditCtrl() : m_pEdit(new CFX_Edit), m_pEditCaret(nullptr), m_bMouseDown(FALSE), - m_nCharSet(DEFAULT_CHARSET), + m_nCharSet(FXFONT_DEFAULT_CHARSET), m_nCodePage(0) {} CPWL_EditCtrl::~CPWL_EditCtrl() {} @@ -476,7 +477,7 @@ void CPWL_EditCtrl::ShowVScrollBar(FX_BOOL bShow) {} void CPWL_EditCtrl::InsertText(const CFX_WideString& wsText) { if (!IsReadOnly()) - m_pEdit->InsertText(wsText, DEFAULT_CHARSET); + m_pEdit->InsertText(wsText, FXFONT_DEFAULT_CHARSET); } void CPWL_EditCtrl::InsertWord(uint16_t word, int32_t nCharset) { @@ -567,7 +568,7 @@ void CPWL_EditCtrl::IOnInvalidateRect(CFX_FloatRect* pRect) { } int32_t CPWL_EditCtrl::GetCharSet() const { - return m_nCharSet < 0 ? DEFAULT_CHARSET : m_nCharSet; + return m_nCharSet < 0 ? FXFONT_DEFAULT_CHARSET : m_nCharSet; } void CPWL_EditCtrl::GetTextRange(const CFX_FloatRect& rect, diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp index 7bb9c76779..d49f4ec6c0 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp @@ -93,7 +93,8 @@ int32_t CPWL_FontMap::GetWordFontIndex(uint16_t word, return nFontIndex; } else { if (const CPWL_FontMap_Data* pData = GetFontMapData(0)) { - if (nCharset == DEFAULT_CHARSET || pData->nCharset == SYMBOL_CHARSET || + if (nCharset == FXFONT_DEFAULT_CHARSET || + pData->nCharset == FXFONT_SYMBOL_CHARSET || nCharset == pData->nCharset) { if (KnowWord(0, word)) return 0; @@ -107,7 +108,8 @@ int32_t CPWL_FontMap::GetWordFontIndex(uint16_t word, if (KnowWord(nNewFontIndex, word)) return nNewFontIndex; } - nNewFontIndex = GetFontIndex("Arial Unicode MS", DEFAULT_CHARSET, FALSE); + nNewFontIndex = + GetFontIndex("Arial Unicode MS", FXFONT_DEFAULT_CHARSET, FALSE); if (nNewFontIndex >= 0) { if (KnowWord(nNewFontIndex, word)) return nNewFontIndex; @@ -167,7 +169,7 @@ void CPWL_FontMap::Empty() { } void CPWL_FontMap::Initialize() { - GetFontIndex(kDefaultFontName, ANSI_CHARSET, FALSE); + GetFontIndex(kDefaultFontName, FXFONT_ANSI_CHARSET, FALSE); } FX_BOOL CPWL_FontMap::IsStandardFont(const CFX_ByteString& sFontName) { @@ -183,7 +185,7 @@ int32_t CPWL_FontMap::FindFont(const CFX_ByteString& sFontName, int32_t nCharset) { for (int32_t i = 0, sz = m_aData.GetSize(); i < sz; i++) { if (CPWL_FontMap_Data* pData = m_aData.GetAt(i)) { - if (nCharset == DEFAULT_CHARSET || nCharset == pData->nCharset) { + if (nCharset == FXFONT_DEFAULT_CHARSET || nCharset == pData->nCharset) { if (sFontName.IsEmpty() || pData->sFontName == sFontName) return i; } @@ -236,7 +238,7 @@ void CPWL_FontMap::AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias) {} CFX_ByteString CPWL_FontMap::GetNativeFont(int32_t nCharset) { - if (nCharset == DEFAULT_CHARSET) + if (nCharset == FXFONT_DEFAULT_CHARSET) nCharset = GetNativeCharset(); CFX_ByteString sFontName = GetDefaultFontByCharset(nCharset); @@ -281,7 +283,7 @@ CPDF_Font* CPWL_FontMap::AddSystemFont(CPDF_Document* pDoc, if (sFontName.IsEmpty()) sFontName = GetNativeFont(nCharset); - if (nCharset == DEFAULT_CHARSET) + if (nCharset == FXFONT_DEFAULT_CHARSET) nCharset = GetNativeCharset(); return m_pSystemHandler->AddNativeTrueTypeFontToPDF(pDoc, sFontName, @@ -310,72 +312,76 @@ const CPWL_FontMap_Data* CPWL_FontMap::GetFontMapData(int32_t nIndex) const { } int32_t CPWL_FontMap::GetNativeCharset() { - uint8_t nCharset = ANSI_CHARSET; + uint8_t nCharset = FXFONT_ANSI_CHARSET; int32_t iCodePage = FXSYS_GetACP(); switch (iCodePage) { case 932: // Japan - nCharset = SHIFTJIS_CHARSET; + nCharset = FXFONT_SHIFTJIS_CHARSET; break; case 936: // Chinese (PRC, Singapore) - nCharset = GB2312_CHARSET; + nCharset = FXFONT_GB2312_CHARSET; break; case 950: // Chinese (Taiwan; Hong Kong SAR, PRC) - nCharset = GB2312_CHARSET; + nCharset = FXFONT_GB2312_CHARSET; break; case 1252: // Windows 3.1 Latin 1 (US, Western Europe) - nCharset = ANSI_CHARSET; + nCharset = FXFONT_ANSI_CHARSET; break; case 874: // Thai - nCharset = THAI_CHARSET; + nCharset = FXFONT_THAI_CHARSET; break; case 949: // Korean - nCharset = HANGUL_CHARSET; + nCharset = FXFONT_HANGUL_CHARSET; break; case 1200: // Unicode (BMP of ISO 10646) - nCharset = ANSI_CHARSET; + nCharset = FXFONT_ANSI_CHARSET; break; case 1250: // Windows 3.1 Eastern European - nCharset = EASTEUROPE_CHARSET; + nCharset = FXFONT_EASTEUROPE_CHARSET; break; case 1251: // Windows 3.1 Cyrillic - nCharset = RUSSIAN_CHARSET; + nCharset = FXFONT_RUSSIAN_CHARSET; break; case 1253: // Windows 3.1 Greek - nCharset = GREEK_CHARSET; + nCharset = FXFONT_GREEK_CHARSET; break; case 1254: // Windows 3.1 Turkish - nCharset = TURKISH_CHARSET; + nCharset = FXFONT_TURKISH_CHARSET; break; case 1255: // Hebrew - nCharset = HEBREW_CHARSET; + nCharset = FXFONT_HEBREW_CHARSET; break; case 1256: // Arabic - nCharset = ARABIC_CHARSET; + nCharset = FXFONT_ARABIC_CHARSET; break; case 1257: // Baltic - nCharset = BALTIC_CHARSET; + nCharset = FXFONT_BALTIC_CHARSET; break; case 1258: // Vietnamese - nCharset = VIETNAMESE_CHARSET; + nCharset = FXFONT_VIETNAMESE_CHARSET; break; case 1361: // Korean(Johab) - nCharset = JOHAB_CHARSET; + nCharset = FXFONT_JOHAB_CHARSET; break; } return nCharset; } const FPDF_CharsetFontMap CPWL_FontMap::defaultTTFMap[] = { - {ANSI_CHARSET, "Helvetica"}, {GB2312_CHARSET, "SimSun"}, - {CHINESEBIG5_CHARSET, "MingLiU"}, {SHIFTJIS_CHARSET, "MS Gothic"}, - {HANGUL_CHARSET, "Batang"}, {RUSSIAN_CHARSET, "Arial"}, + {FXFONT_ANSI_CHARSET, "Helvetica"}, + {FXFONT_GB2312_CHARSET, "SimSun"}, + {FXFONT_CHINESEBIG5_CHARSET, "MingLiU"}, + {FXFONT_SHIFTJIS_CHARSET, "MS Gothic"}, + {FXFONT_HANGUL_CHARSET, "Batang"}, + {FXFONT_RUSSIAN_CHARSET, "Arial"}, #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || \ _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ - {EASTEUROPE_CHARSET, "Arial"}, + {FXFONT_EASTEUROPE_CHARSET, "Arial"}, #else - {EASTEUROPE_CHARSET, "Tahoma"}, + {FXFONT_EASTEUROPE_CHARSET, "Tahoma"}, #endif - {ARABIC_CHARSET, "Arial"}, {-1, nullptr}}; + {FXFONT_ARABIC_CHARSET, "Arial"}, + {-1, nullptr}}; CFX_ByteString CPWL_FontMap::GetDefaultFontByCharset(int32_t nCharset) { int i = 0; @@ -390,9 +396,9 @@ CFX_ByteString CPWL_FontMap::GetDefaultFontByCharset(int32_t nCharset) { int32_t CPWL_FontMap::CharSetFromUnicode(uint16_t word, int32_t nOldCharset) { // to avoid CJK Font to show ASCII if (word < 0x7F) - return ANSI_CHARSET; + return FXFONT_ANSI_CHARSET; // follow the old charset - if (nOldCharset != DEFAULT_CHARSET) + if (nOldCharset != FXFONT_DEFAULT_CHARSET) return nOldCharset; // find new charset @@ -400,42 +406,42 @@ int32_t CPWL_FontMap::CharSetFromUnicode(uint16_t word, int32_t nOldCharset) { (word >= 0xE7C7 && word <= 0xE7F3) || (word >= 0x3000 && word <= 0x303F) || (word >= 0x2000 && word <= 0x206F)) { - return GB2312_CHARSET; + return FXFONT_GB2312_CHARSET; } if (((word >= 0x3040) && (word <= 0x309F)) || ((word >= 0x30A0) && (word <= 0x30FF)) || ((word >= 0x31F0) && (word <= 0x31FF)) || ((word >= 0xFF00) && (word <= 0xFFEF))) { - return SHIFTJIS_CHARSET; + return FXFONT_SHIFTJIS_CHARSET; } if (((word >= 0xAC00) && (word <= 0xD7AF)) || ((word >= 0x1100) && (word <= 0x11FF)) || ((word >= 0x3130) && (word <= 0x318F))) { - return HANGUL_CHARSET; + return FXFONT_HANGUL_CHARSET; } if (word >= 0x0E00 && word <= 0x0E7F) - return THAI_CHARSET; + return FXFONT_THAI_CHARSET; if ((word >= 0x0370 && word <= 0x03FF) || (word >= 0x1F00 && word <= 0x1FFF)) - return GREEK_CHARSET; + return FXFONT_GREEK_CHARSET; if ((word >= 0x0600 && word <= 0x06FF) || (word >= 0xFB50 && word <= 0xFEFC)) - return ARABIC_CHARSET; + return FXFONT_ARABIC_CHARSET; if (word >= 0x0590 && word <= 0x05FF) - return HEBREW_CHARSET; + return FXFONT_HEBREW_CHARSET; if (word >= 0x0400 && word <= 0x04FF) - return RUSSIAN_CHARSET; + return FXFONT_RUSSIAN_CHARSET; if (word >= 0x0100 && word <= 0x024F) - return EASTEUROPE_CHARSET; + return FXFONT_EASTEUROPE_CHARSET; if (word >= 0x1E00 && word <= 0x1EFF) - return VIETNAMESE_CHARSET; + return FXFONT_VIETNAMESE_CHARSET; - return ANSI_CHARSET; + return FXFONT_ANSI_CHARSET; } diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h index 0ebd059b08..bb3925d5c2 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/pdfwindow/PWL_FontMap.h @@ -10,6 +10,7 @@ #include #include "core/fpdfdoc/include/ipvt_fontmap.h" +#include "core/fxge/include/fx_font.h" #include "fpdfsdk/fxedit/include/fx_edit.h" #include "public/fpdf_sysfontinfo.h" @@ -27,28 +28,6 @@ struct CPWL_FontMap_Native { CFX_ByteString sFontName; }; -#ifndef ANSI_CHARSET - -#define ANSI_CHARSET 0 -#define DEFAULT_CHARSET 1 -#define SYMBOL_CHARSET 2 -#define SHIFTJIS_CHARSET 128 -#define HANGUL_CHARSET 129 -#define GB2312_CHARSET 134 -#define CHINESEBIG5_CHARSET 136 -#define JOHAB_CHARSET 130 -#define HEBREW_CHARSET 177 -#define ARABIC_CHARSET 178 -#define GREEK_CHARSET 161 -#define TURKISH_CHARSET 162 -#define VIETNAMESE_CHARSET 163 -#define THAI_CHARSET 222 -#define EASTEUROPE_CHARSET 238 -#define RUSSIAN_CHARSET 204 -#define BALTIC_CHARSET 186 - -#endif - class CPWL_FontMap : public IPVT_FontMap { public: CPWL_FontMap(CFX_SystemHandler* pSystemHandler); @@ -85,7 +64,7 @@ class CPWL_FontMap : public IPVT_FontMap { FX_BOOL bFind); int32_t AddFontData(CPDF_Font* pFont, const CFX_ByteString& sFontAlias, - int32_t nCharset = DEFAULT_CHARSET); + int32_t nCharset = FXFONT_DEFAULT_CHARSET); CFX_ByteString EncodeFontAlias(const CFX_ByteString& sFontName, int32_t nCharset); @@ -96,7 +75,7 @@ class CPWL_FontMap : public IPVT_FontMap { private: int32_t FindFont(const CFX_ByteString& sFontName, - int32_t nCharset = DEFAULT_CHARSET); + int32_t nCharset = FXFONT_DEFAULT_CHARSET); CFX_ByteString GetNativeFont(int32_t nCharset); CPDF_Font* AddFontToDocument(CPDF_Document* pDoc, -- cgit v1.2.3