From 6e3dca5a1ac9781e5c48c443610e9eca19949c9f Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Sat, 5 Jul 2025 20:03:45 +0100 Subject: [PATCH] FSUI: Remove font glyph ranges and add exclude ranges The original glyph ranges are legacy and aren't used --- .../scripts/common/update_base_translation.sh | 1 - pcsx2-gsrunner/Main.cpp | 2 +- pcsx2-qt/Translations.cpp | 109 ++++-------------- pcsx2-qt/Translations/update_glyph_ranges.py | 69 ----------- pcsx2/ImGui/ImGuiManager.cpp | 47 +++----- pcsx2/ImGui/ImGuiManager.h | 2 +- tools/generate_update_fa_glyph_ranges.py | 78 +++++++++---- 7 files changed, 91 insertions(+), 217 deletions(-) delete mode 100755 pcsx2-qt/Translations/update_glyph_ranges.py mode change 100644 => 100755 tools/generate_update_fa_glyph_ranges.py diff --git a/.github/workflows/scripts/common/update_base_translation.sh b/.github/workflows/scripts/common/update_base_translation.sh index b1b055051f..b60fbf645d 100755 --- a/.github/workflows/scripts/common/update_base_translation.sh +++ b/.github/workflows/scripts/common/update_base_translation.sh @@ -9,6 +9,5 @@ set -e "$SCRIPTDIR/../../../../tools/retry.sh" sudo apt-get -y install qt6-l10n-tools python3 "$SCRIPTDIR/../../../../tools/generate_fullscreen_ui_translation_strings.py" -"$SCRIPTDIR/../../../../pcsx2-qt/Translations/update_glyph_ranges.py" "$SCRIPTDIR/../../../../tools/generate_update_fa_glyph_ranges.py" PATH=/usr/lib/qt6/bin:$PATH "$SCRIPTDIR/../../../../pcsx2-qt/Translations/update_base_translation.sh" diff --git a/pcsx2-gsrunner/Main.cpp b/pcsx2-gsrunner/Main.cpp index 181fd362c1..f1ecaffb24 100644 --- a/pcsx2-gsrunner/Main.cpp +++ b/pcsx2-gsrunner/Main.cpp @@ -103,7 +103,7 @@ bool GSRunner::InitializeConfig() if (!VMManager::PerformEarlyHardwareChecks(&error)) return false; - ImGuiManager::SetFontPathAndRange(Path::Combine(EmuFolders::Resources, "fonts" FS_OSPATH_SEPARATOR_STR "Roboto-Regular.ttf"), {}); + ImGuiManager::SetFontPath(Path::Combine(EmuFolders::Resources, "fonts" FS_OSPATH_SEPARATOR_STR "Roboto-Regular.ttf")); // don't provide an ini path, or bother loading. we'll store everything in memory. MemorySettingsInterface& si = s_settings_interface; diff --git a/pcsx2-qt/Translations.cpp b/pcsx2-qt/Translations.cpp index 755eab2b5c..edb92d0881 100644 --- a/pcsx2-qt/Translations.cpp +++ b/pcsx2-qt/Translations.cpp @@ -50,16 +50,15 @@ QT_TRANSLATE_NOOP("PermissionsDialogCamera", "PCSX2 uses your camera to emulate namespace QtHost { - struct GlyphInfo + struct FontInfo { const char* language; const char* imgui_font_name; - const char16_t* used_glyphs; }; static void UpdateGlyphRangesAndClearCache(QWidget* dialog_parent, const std::string_view language); static bool DownloadMissingFont(QWidget* dialog_parent, const char* font_name, const std::string& path); - static const GlyphInfo* GetGlyphInfo(const std::string_view language); + static const FontInfo* GetFontInfo(const std::string_view language); static constexpr const char* DEFAULT_IMGUI_FONT_NAME = "Roboto-Regular.ttf"; @@ -278,50 +277,14 @@ std::vector> QtHost::GetAvailableLanguageList() }; } -static constexpr const ImWchar s_base_latin_range[] = { - 0x0020, 0x00FF, // Basic Latin + Latin Supplement -}; -static constexpr const ImWchar s_central_european_ranges[] = { - 0x0100, 0x017F, // Central European diacritics -}; - void QtHost::UpdateGlyphRangesAndClearCache(QWidget* dialog_parent, const std::string_view language) { - const GlyphInfo* gi = GetGlyphInfo(language); + const FontInfo* fi = GetFontInfo(language); const char* imgui_font_name = nullptr; - std::vector glyph_ranges; - // Base Latin range is always included. - glyph_ranges.insert(glyph_ranges.begin(), std::begin(s_base_latin_range), std::end(s_base_latin_range)); - - if (gi) - { - if (gi->used_glyphs) - { - const char16_t* ptr = gi->used_glyphs; - while (*ptr != 0) - { - // Always should be in pairs. - pxAssert(ptr[0] != 0 && ptr[1] != 0); - glyph_ranges.push_back(*(ptr++)); - glyph_ranges.push_back(*(ptr++)); - } - } - - imgui_font_name = gi->imgui_font_name; - } - - // If we don't have any specific glyph range, assume Central European, except if English, then keep the size down. - if ((!gi || !gi->used_glyphs) && language != "en") - { - glyph_ranges.insert( - glyph_ranges.begin(), std::begin(s_central_european_ranges), std::end(s_central_european_ranges)); - } - - // List terminator. - glyph_ranges.push_back(0); - glyph_ranges.push_back(0); + if (fi) + imgui_font_name = fi->imgui_font_name; // Check for the presence of font files. std::string font_path; @@ -343,16 +306,16 @@ void QtHost::UpdateGlyphRangesAndClearCache(QWidget* dialog_parent, const std::s // Called on UI thread, so we need to do this on the CPU/GS thread if it's active. if (g_emu_thread) { - Host::RunOnCPUThread([font_path = std::move(font_path), glyph_ranges = std::move(glyph_ranges)]() mutable { + Host::RunOnCPUThread([font_path = std::move(font_path)]() mutable { if (MTGS::IsOpen()) { - MTGS::RunOnGSThread([font_path = std::move(font_path), glyph_ranges = std::move(glyph_ranges)]() mutable { - ImGuiManager::SetFontPathAndRange(std::move(font_path), std::move(glyph_ranges)); + MTGS::RunOnGSThread([font_path = std::move(font_path)]() mutable { + ImGuiManager::SetFontPath(std::move(font_path)); }); } else { - ImGuiManager::SetFontPathAndRange(std::move(font_path), std::move(glyph_ranges)); + ImGuiManager::SetFontPath(std::move(font_path)); } Host::ClearTranslationCache(); @@ -361,7 +324,7 @@ void QtHost::UpdateGlyphRangesAndClearCache(QWidget* dialog_parent, const std::s else { // Startup, safe to set directly. - ImGuiManager::SetFontPathAndRange(std::move(font_path), std::move(glyph_ranges)); + ImGuiManager::SetFontPath(std::move(font_path)); Host::ClearTranslationCache(); } } @@ -393,50 +356,20 @@ bool QtHost::DownloadMissingFont(QWidget* dialog_parent, const char* font_name, return QtHost::DownloadFile(dialog_parent, progress_title, std::move(url), path); } -// clang-format off -static constexpr const char16_t s_cyrillic_ranges[] = { - /* Cyrillic + Cyrillic Supplement */ 0x0400, 0x052F, /* Extended-A */ 0x2DE0, 0x2DFF, /* Extended-B */ 0xA640, 0xA69F, 0, 0 +static constexpr const QtHost::FontInfo s_font_info[] = { + {"ar-SA", "NotoSansArabic-Regular.ttf"}, + {"fa-IR", "NotoSansArabic-Regular.ttf"}, + {"hi-IN", "NotoSansDevanagari-Regular.ttf"}, + {"he-IL", "NotoSansHebrew-Regular.ttf"}, + {"ja-JP", "NotoSansJP-Regular.ttf"}, + {"ko-KR", "NotoSansKR-Regular.ttf"}, + {"zh-CN", "NotoSansSC-Regular.ttf"}, + {"zh-TW", "NotoSansTC-Regular.ttf"}, }; -static constexpr const char16_t s_arabic_ranges[] = { 0x0600, 0x06FF, 0, 0 }; -static constexpr const char16_t s_greek_ranges[] = { 0x0370, 0x03FF, 0x1D00, 0x1D7F, 0, 0 }; -static constexpr const char16_t s_hindi_ranges[] = { 0x0900, 0x097F, 0, 0 }; -static constexpr const char16_t s_hebrew_ranges[] = { 0x0590, 0x05FF, 0xFB1D, 0xFB4F, 0, 0 }; -static constexpr const QtHost::GlyphInfo s_glyph_info[] = { - { "ar-SA", "NotoSansArabic-Regular.ttf", s_arabic_ranges }, - { "el-GR", nullptr, s_greek_ranges }, - { "fa-IR", "NotoSansArabic-Regular.ttf", s_arabic_ranges }, - { "hi-IN", "NotoSansDevanagari-Regular.ttf", s_hindi_ranges }, - { "he-IL", "NotoSansHebrew-Regular.ttf", s_hebrew_ranges }, - { "ru-RU", nullptr, s_cyrillic_ranges }, - { "sr-SP", nullptr, s_cyrillic_ranges }, - { "uk-UA", nullptr, s_cyrillic_ranges }, - { - "ja-JP", "NotoSansJP-Regular.ttf", - // auto update by update_glyph_ranges.py with pcsx2-qt_ja-JP.ts - u"​​……□□△△◯◯✕✕、。々々「』〜〜ああいいううええおせそそたちっぬのばびびぶぶへべほぼまもややよろわわをんァイウチッツテニネロワワンヴ・ー一一上下不与世世両両並並中中丸丸乗乗乱乱了了予予事事互互交交今介他他付付代以仮仮件件任任伸伸似似位低体体何何作作使使例例供供依依価価係係保保信信修修個個倍倍借借値値停停側側傍傍備備像像償償優優元元先光入入全全公公共共具具内内再再冗冗処処出出分切列列初初判別利利制刷削削前前副副割割力力加加劣劣効効動動勧勧化化十十半半南単印印即即厳厳去去参参及及反収取受口古可台右右号号各各合合同名向向含含告告周周味味命命品品商商問問善善回回囲囲固固国国圧在均均垂垂型型域域基基報報場場境境増増壊壊声声変変外外多多大大太太央央失失奇奇奨奨好好妙妙妨妨始始子子字存安安完完定定実実容容密密対対専専射射尊尊小小少少尾尾展展崩崩左左巨巨差差己己帰帰常常幅幅平平幹幹序序度座延延式式引引弱弱張張強強当当形形彩彩影影役役待待後後従従得得御御復復微微心心必必応応忠忠念念思思急急性性恐恐悪悪情情想想意意感感態態慣慣成成戦戦戻戻所所手手打打扱扱承承抜抜択択抱抱押押拠拡拳拳持持指指振振挿挿捗捗排排探探接接推推描提換換援援揺揺損損搭搭撮撮操操支支改改放放敗敗数数整整文文料料断断新新方方既既日日早早昇昇明明昨昨時時普普曲曲更更書書替最有有期期未本条条析析果果格格械械検検業業極極楽楽概概構構標標権権橙橙機機欠次止正殊残母毎比比水水求求汎汎決決況況法法波波注注浪浪浮浮消消深深済済減減渡渡港港湾湾満満源源準準滑滑演演点点無無照照牲牲特特犠犠状状独独獲獲率率現現理理璧璧環環生生用用由由申申画画留留番番異異発登白白的的目目直直相相省省知知短短破破確確示示禁禁秒秒移移程程種種空空立立端端第第等等策策算算管管節節範範精精索索細細終終組組経経結結統統継続維維緑緒線線編編縦縦縮縮績績繰繰置置義義習習者者聴聴肢肢背背能能自自致致般般良良色色英英荷荷落落蔵蔵行行表表衰衰装装補補製製複複要要見見規規視視覚覚覧覧親親観観角角解解言言計計記記設設許許訳訳証証評評試試該詳認認語語誤誤説読調調識識警警象象負負責責費費資資質質赤赤起起超超足足跡跡転転軸軸軽軽載載込込近近返返述述追追送送逆逆通通速速連連進進遅遅遊遊遍過達達適適選選避避部部配配重量鉄鉄録録長長閉閉開開間間関関閾閾防防降降限限除陥陽陽隅隅隔隔際際集集雑雑離難電電青青静静非非面面韓韓音音響響頂頂順順領領頻頼題題類類飾飾香香駄駄高高鮮鮮黄黄！！（）１１：：＞？～～" - }, - { - "ko-KR", "NotoSansKR-Regular.ttf", - // auto update by update_glyph_ranges.py with pcsx2-qt_ko-KR.ts - u"​​“”……←↓□□△△◯◯✕✕んん茶茶가각간간갈갈감값강강같같개개갱갱거거건건걸걸검겁것것게게겟겠격격견견결결경경계계고곡골골곱곱곳곳공공과과관관괄괄교교구국군군권권귀귀규규균균그극근근글글금급긍긍기기긴긴길길김깁깃깃깅깅까까깝깝깨깨꺼꺼께께꼴꼴꾸꾸꿉꿉끄끄끊끊끔끔끝끝나나난난날날남남낭낮내내낸낸냅냅너너널널넣네넬넬넷넷녀녀노녹농농높놓누누눈눈눌눌눕눕눗눗뉴뉴느느는는늘늘능능니니닌닌닐닐님닙닛닛다다단단닫달당당닿대댑댑더더덜덜덤덤덮덮데덱덴덴델델도독돌돌동동됐됐되되된된될될됨됩두두둘둘둡둡뒤뒤듀듀듈듈드득든든들들듬듭등등디디딩딩따따때때떠떠떤떤떨떨또또뛰뛰뛸뛸뜁뜁뜨뜨띄띄라락란란랄랄람랍랑랑래랙랜랜램램랫랫량량러럭런런럴럴럼럽렀렀렇렉렌렌렛렛려력련련렬렬렸령로록롤롤롭롭롯롯료료루루룸룹류류률률륨륨르르른른를를름릅리릭린린릴릴림립릿릿링링마막만만많많말말맞맞매매맨맨맵맵맷맷맺맺머머먼먼멀멀멈멈멋멋메메멤멤며며면면명명모목몬몬못못무무문문물물뮬뮬므므미믹민민밀밀밉밉밍밍및및바밖반반받밝밥밥방방배백밴밴뱃뱃버버번번벌벌범법벗벗베벡벤벤벨벨벼벽변변별별병병보복본본볼볼부부분분불붉붙붙뷰뷰브브블블비빅빈빈빌빌빙빙빛빛빠빠빨빨뿔뿔사삭산산살살삼삽상상새색샘샘생생샤샤샷샷서석선선설설성성세섹센센셀셀셈셉셋셋셔셔션션셰셰소속손손솔솔송송쇄쇄쇠쇠쇼쇼수숙순순숨숨숫숫쉽쉽슈슈스스슬슬습습슷슷시식신신실실심십싱싱싶싶쌍쌍쓰쓰쓴쓴쓸쓸씬씬아악안안않않알알암압았앙앞앞애액앤앤앨앨앱앱앵앵야약양양어어언언얻얼업없었었에엑엔엔여역연연열열영영예예오오온온올올옵옵와와완완왑왑왔왔외외왼왼요요용용우우운운울울움웁웃웃워워원원월월웠웠웨웨웹웹위위윈윈유유율율으으은은을을음음응응의의이이인인일읽임입있있자작잘잘잠잡장장재재잿잿저적전전절절점접정정제제젠젠젤젤젯젯져져졌졌조족존존종종좋좌죄죄주죽준준줄줄줍줍중중즈즉즐즐즘즘증증지직진진질질짐집짜짝짧짧째째쨌쨌쪽쪽찌찍차착참참창찾채책처척천천철철첨첩첫첫청청체체쳐쳐초초총총촬촬최최추축출출춤춥충충춰춰취취츠측치칙칠칠침칩칭칭카카칸칸칼칼캐캐캔캔캘캘캠캡커커컨컨컬컬컴컴케케켓켓켜켜켬켬코코콘콘콜콜콩콩퀀퀀퀴퀴큐큐크크큰큰클클큼큽키키킨킨킬킬킵킵킷킷킹킹타타탈탈탐탐탕탕태택탠탠탬탭터터턴턴털털텀텀테텍텐텐텔텔템템토토톨톨톱톱통통투투트특튼튼틀틀티틱팀팀팅팅파파팔팔팝팝패팩팻팻퍼퍼펌펌페펙편편평평포폭폴폴폼폼표표푸푸풀풀품품풋풋풍풍퓨퓨프프픈픈플플피픽핀핀필필핑핑하학한한할할함합핫핫항항해핵핸핸했행향향허허헌헌헐헐헤헤헨헨혀혀현현혔형호혹혼혼홈홈홍홍화확환환활활황황회획횟횟횡횡효효후후훨훨휠휠휴휴흐흐흔흔희희히히힌힌" - }, - { - "zh-CN", "NotoSansSC-Regular.ttf", - // auto update by update_glyph_ranges.py with pcsx2-qt_zh-CN.ts - u"‘’“”□□△△○○、。一丁七七三下不与专且世世丢丢两严个个中中串串临临为主久久么义之之乎乎乐乐乘乘也也了了事二于于互互五五亚些亡亡交交产产享享亮亮人人什什仅仅今介仍从他他代以们们仲仲件价任任份份伍伍休休众优会会传传伪伪估估伸伸似似但但位住佑佑体体何何余余作作你你佳佳使使例例供供依依侧侧便便俄俄保保信信修修倍倍倒倒借借值值倾倾假假偏偏做做停停储储像像儿儿允允元元充兆先光克克免免入入全全八六兰共关关其兹兼兼内内册再写写冲决况况冻冻准准减减几凡凭凭凹击函函刀刀刃刃分切列列则创初初删删利利别别到到制刷刹刹前前剪剪副副力力功务动助势势勾匀包包化北匹区十十升升半半协协单单南南占卡卫卫印印即即卸卸历历压压原原去去参参又及双反发发取变叠叠口古另另只只叭叭可台史右号司各各合吉同后向向吗吗否否含听启启呈呈告告员员味味命命和和哈哈响响哪哪唤唤商商善善喇喇喜喜器器噪噪四四回回因因团团围围固固国图圆圆圈圈在在地地场场址址均均坏坐块块坛坛垂垂型型域域基基堂堂堆堆堪堪塔塔填填增增士士声声处处备备复复夏夏外外多多够够大大天夫失失头头夹夹奇奇奏奏套套奥奥女女奶奶好好如如始始威威娜娜娱娱婴婴媒媒子子字存学学它它安安完完宏宏官官定定宝实客客害害家家容容宽宿寄寄密密富富寸对导导封封射射将将小小少少尔尔尘尘尚尚尝尝就就尺尺尼尾局局层层屏屏展展属属山山崩崩工左巨巨巫巫差差己已巴巴布布希希带帧帮帮常常幅幅幕幕干平并并幸幸幻幻序序库底度度延延建建开开异弃弊弊式式引引张张弹强归当录录形形彩彩影影径待很很律律得得循循微微德德心心必忆志志忙忙快快忽忽态态急急性性怪怪总总恢恢恭恭息息恶恶您您悬悬情情惑惑惯惯想想愉愉意意感感慢慢戏我或或战战截截戳戳户户所扁扇扇手手才才打打托托执执扩扩扫扬扳扳找技把把抑抑抖抗护护拆拆拉拉拖拖拟拟拥拦拨择括括拳拳拷拷拽拾持挂指指按按挑挑挡挡挪挪振振捆捆捕捕损损换换据据捷捷掌掌排排接接控掩描提插插握握搜搜摄摄摇摇摔摔摘摘撤撤播播操擎擦擦支支收收改改放放故故效效敌敌敏敏散散数数整整文文斜斜断断斯新方方旁旁旅旅旋旋无无既既日日旧旧时时明明易易星映昨昨是是显显晕晕普普晰晰暂暂暗暗曲曲更更替最有有服服望望期期未未本本术术机机杂权杆杆束束条条来来松板极极构构析析果果枪枪柄柄某某染染查查栅栅标栈栏栏树树校校样根格格框框案案桌桌档档桥桥桩桩梦梦检检棕棕榜榜槽槽模模横横橙橙次欢欧欧款款歇歇止步死死殊殊段段每每比比毫毫气气水水求求汇汇池污沙沙没没油油法法泡波注注泻泻洋洋洲洲活活流流浅浅测测浏浏浪浪浮浮海海消消淡淡深深混混添添清清渐渐港港渲渲游游湖湖湾湾溃溃源源溢溢滑滑滚滚满满滤滤演演潜潜澳澳激激火火灯灰灵灵点点烈烈热热焦焦然然煞煞照照爆爆父父片版牌牌牙牙物物特特状状独独狼狼猩猩率率王王玛玛玩玩环现班班球球理理瑞瑞甚甚生生用用由由电电画画畅畅界界留留略略疤疤登登白百的的皇皇监监盖盘目目直直相相省省看看真眠着着瞄瞄矢矢知知短短石石码码破破础础硬硬确确碌碌碎碎磁磁示示神神禁禁离离种种秒秒称称移移程程稍稍稳稳空空突突窗窗立立站站竞竞端端符符第第等等答答筛筛签签简简算算管管篇篇类类粉粉粗粘精精糊糊糙糙系系素素索索紧紧紫紫纠纠红红约级纳纳纵纵纹纹线线组组细终经经绑绑结结绕绕绘给络绝统统继继绪绪续续维维绿缀缓缓编编缘缘缩缩缺缺网网罗罗置置美美翠翡翻翻考考者者而而耗耗耳耳联联肩肩胖胖能能脑脑脚脚腊腊臂臂自自至致舍舍航航良良色色节节芬芬若若英英范范荐荐荡荡荷荷莱莱获获菜菜萄萄著著葡葡蓝蓝藏藏虑虑虚虚融融行行街街衡衡补补表表被被裁裁装装西西要要覆覆见观规规视视览觉角角解解触触言言警警计计认认让让议议记记许许论论设访证证识识诉诊译译试试话话询询该详语语误误说说请诸读读调调象象贝贝负负败账质质贴贴费费赖赖赛赛赫赫起起超超越越足足跃跃距距跟跟跤跤路路跳跳踏踏踪踪身身车车轨轨转转轮软轴轴轻轻载载较较辅辅辑辑输输辨辨边边达达迁迁过过迎迎运近返返还这进远连迟述述迷迷追追退适逆逆选选逐逐递递通通速造遇遇道道遵遵避避那那邻邻部部都都配配醒醒采采释释里重量量金金针针钟钟钩钩钮钮铁铁铺铺链链销锁锐锐错错键锯镜镜长长门门闭问闲闲间间阅阅队队防阶阻阻附陆降降限限陡陡除除险险隆隆随隐隔隔隙隙障障雄雄集集零零雾雾需需震震静静非非靠靠面面韩韩音音页顶项须顿顿预预频频题题颜额颠颠颤颤风风饱饱馈馈首首香香马马驱驱验验骑骑骤骤高高鬼鬼魂魂魔魔麦麦黄黄黑黑默默鼓鼓鼠鼠齐齐齿齿，，：：？？" - }, - { - "zh-TW", "NotoSansTC-Regular.ttf", - // auto update by update_glyph_ranges.py with pcsx2-qt_zh-TW.ts - u"□□△△○○、。『』一丁三下不不且且世世丟丟並並中中主主之之乎乎乘乙也也了了事二于于互互五五些些亞亞交交享享亮亮人人什什今介他他代以件件任任份份休休估估伸伸伺伺似似但佇位住佔何作作你你佳佳併併使使來來例例供供依依係係俄俄保保修修個個倍倍們倒借借值值假假偏偏做做停停側偵備備傳傳傾傾僅僅像像價價儘儘優優儲儲允允元元充充先光克克免免兒兒入入內兩公公共共其典冊冊再再凍凍出出刀刀分切列列初初別別利刪到到制制則則前剎剪剪副副創創力力功加助助動動務務勢勢勾勾包包化化匯匯匹匹區十升升半半協協南南卡卡印印即即原原去去參參叉及反反取受口口另另只叫可可右右司司各各合吉同后向向否否含含呈呈告告呼命和和哈哈員員哪哪商商問問啓啓啟啟善善喚喚單單嗎嗎嘉嘉嘗嘗器器嚮嚮嚴嚴四四回回因因圈圈國國圍圍圖圖團團在在地地址址均均垂垂型型域埠執執基基堆堆堪堪場場塊塊塔塔填填塵塵增增壇壇壓壓壞壞士士外外多多夠夠大大天太失失夾夾奇奇奏奏套套奧奧奶奶好好如如始始威威娛娜嬰嬰子子字存它它安安完完宏宏官官定定害害家家容容宿宿密密富富察察實實寫寬寶寶寸寸封封射射將專對小少少尚尚就就尺尺尼尼尾尾屏屏展展層層屬屬崩崩工左巨巨差差己已巴巴希希帳帳帶帶常常幀幀幅幅幕幕幫幫平平幸幸幾幾序序底底度座庫庫延延建建弊弊式式引引張張強強彈彈形形彩彩影影待待很很律後徑徑得得從從復循微微德德心心必必快快忽忽性性怪怪恢恢息息您您情情想想愉愉意意感感態態慢慣慮慮憑憑憶憶應應成我或或截截戰戰戲戳戶戶所扁扇扇手手才才打打扳扳找找技技抑抑抖抗拉拉括括拳拳持持指指按按挑挑挪挪振振捕捕捨捨捷捷掃掃授授掌掌排排掛掛採採接接控掩描提插插換換握握援援損損搖搖搜搜撤撤播播擁擁擇擇擊擋操擎據據擬擬擴擴擷擷攔攔支支收收改改放放故故效效敏敏敗敗整敵數數文文料料斜斜斯新斷斷方方於於旁旁旋旋日日明明易易星映昨昨是是時時普普晰晰暈暈暗暗暢暢暫暫曲曲更更替最會會有有服服望望期期未未本本束束板板析析果果柄柄某某染染查查柵柵校校核根格格框框案案桌桌桿桿條條棄棄棕棕極極榜榜槍槍槽槽樂樂標標模模樣樣橋橋橙橙機機橫橫檔檔檢檢檯檯欄欄權權次次款款歐歐止步歸歸死死殊殊每每比比毫毫水水永永求求污污決決沒沒沙沙油油況況法法波波注注洲洲活活流流浮浮消消淡淡深深混混淺添清清減減測測港港渲渲游游湊湊湖湖源源準準溢溢滑滑滿滿演演潰潰澳澳激激濾濾瀉瀉瀏瀏灣灣灰灰為為烈烈無無焦焦然然照照熱熱爲爲爾爾片版牌牌牙牙特特狀狀猩猩獨獨獲獲率率王王玩玩班班現現理理瑞瑞瑪瑪環環甚甚生生產產用用由由界界留留略略畫畫異異當當疊疊登百的的皇皇盡盡監盤目目直直相相看看真眠瞄瞄知知短短石石破破硬硬碎碎碟碟確確碼碼磁磁礎礎示示禁禁秒秒移移程程稍稍種種稱稱穩穩空空窗窗立立站站端端符符第第等等答答算算管管節節範範篩篩簡簡簿簿籤籤粉粉精精糊糊系系紅紅紋紋納納級級素素索索紫紫細細紹紹終終組組結結統統經經綠綠維維網網緒緒線線緣緣編緩縮縮縱縱織織繞繞繪繫繼繼續續缺缺置置羅羅美美義義翻翻考考者者而而耗耗耳耳聯聯聲聲肩肩胖胖能能臘臘自自至致臺臺與與舊舊舍舍航航良良色色芬芬芽芽若若英英茲茲荷荷菜菜萄萄萊萊著著葡葡蓋蓋薦薦藍藍藏藏蘭蘭處處虛虛號號融融螢螢行行衝衝衡衡表表被被裁裁補裝裡裡製製複複西西要要覆覆見見規規視視覺覺覽覽觀觀角角解解觸觸言言計計訊訊託記訪訪設設許許診註詢詢試試話詳誌認語語誤誤說說調調請請論論證證識識警警譯議護護讀讀變變讓讓象象負負費貼資資賓賓質質賬賬賴賴赫赫起起超超越越足足跟跟路路跳跳踏踏蹤蹤身身車車軌軌軟軟軸軸較較載載輔輕輪輪輯輯輸輸轉轉近近返返述述迴迴追追退送逆逆逐逐這通速造連連進進遇遇遊運過過道達遞遞適適遲遲選選避避還還邊邊那那部部都都鄰鄰配配醒醒重重量量金金針針鈕鈕銳銳銷銷鋪鋪鋸鋸錄錄錯錯鍵鍵鎖鎖鏈鏈鏡鏡鐵鐵門門閉閉開開間間閘閘閱閱關關防防附附降降限限陣除陰陰陸陸隊隊隔隔隙隙際障隨隨險險隱隱雄雄集集雙雙雜雜離離零零電電需需震震霧霧靈靈靜靜非非靠靠面面韓韓音音響響頂頂項順須須預預頓頓頭頭頻頻題額顏顏顛顛類類顯顯風風飽飽餘餘饋饋首首香香馬馬驅驅驗驗體體高高髮髮鬼鬼魂魂魔魔麥麥麼麼黃黃黑黑點點鼓鼓鼠鼠齊齊齒齒（），，：：？？" - }, -}; -// clang-format on - -const QtHost::GlyphInfo* QtHost::GetGlyphInfo(const std::string_view language) +const QtHost::FontInfo* QtHost::GetFontInfo(const std::string_view language) { - for (const GlyphInfo& it : s_glyph_info) + for (const FontInfo& it : s_font_info) { if (language == it.language) return ⁢ diff --git a/pcsx2-qt/Translations/update_glyph_ranges.py b/pcsx2-qt/Translations/update_glyph_ranges.py deleted file mode 100755 index 58d857c0ae..0000000000 --- a/pcsx2-qt/Translations/update_glyph_ranges.py +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env python3 - -import os -import re -import xml.etree.ElementTree as ET - -languages_to_update = [ - "ja-JP", - "ko-KR", - "zh-CN", - "zh-TW" -] - -src_path = os.path.join(os.path.dirname(__file__), "..", "Translations.cpp") -ts_dir = os.path.join(os.path.dirname(__file__)) - -def parse_xml(path): - tree = ET.parse(path) - root = tree.getroot() - translations = "" - for node in root.findall("context/message/translation"): - if node.text: - translations += node.text - - ords = list(set([ord(ch) for ch in translations if ord(ch) >= 0x2000])) - if len(ords) == 0: - return "" - - # Try to organize it into ranges - ords.sort() - ord_pairs = [] - start_ord = None - last_ord = None - for nord in ords: - if start_ord is not None and nord == (last_ord + 1): - last_ord = nord - continue - if start_ord is not None: - ord_pairs.append(start_ord) - ord_pairs.append(last_ord) - start_ord = nord - last_ord = nord - - if start_ord is not None: - ord_pairs.append(start_ord) - ord_pairs.append(last_ord) - - chars = "".join([chr(ch) for ch in ord_pairs]) - return chars - -def update_src_file(ts_file, chars): - ts_name = os.path.basename(ts_file) - pattern = re.compile('(// auto update.*' + ts_name + '.*\n[^"]+")[^"]*(".*)') - with open(src_path, "r", encoding="utf-8") as f: - original = f.read() - update = pattern.sub("\\1" + chars + "\\2", original) - if original != update: - with open(src_path, "w", encoding="utf-8") as f: - f.write(update) - print(f"Updated character list for {ts_file}.") - else: - print(f"Character list is unchanged for {ts_file}.") - -if __name__ == "__main__": - for language in languages_to_update: - ts_file = os.path.join(ts_dir, f"pcsx2-qt_{language}.ts") - chars = parse_xml(ts_file) - print(f"{language}: {len(chars)} character(s) detected.") - update_src_file(ts_file, chars) diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index f9f468db27..b548811b19 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -68,7 +68,6 @@ namespace ImGuiManager static float s_global_scale = 1.0f; static std::string s_font_path; -static std::vector s_font_range; static ImFont* s_standard_font; static ImFont* s_fixed_font; @@ -101,13 +100,12 @@ static bool s_scale_changed = false; static std::array s_software_cursors = {}; -void ImGuiManager::SetFontPathAndRange(std::string path, std::vector range) +void ImGuiManager::SetFontPath(std::string path) { - if (s_font_path == path && s_font_range == range) + if (s_font_path == path) return; s_font_path = std::move(path); - s_font_range = std::move(range); s_standard_font_data = {}; if (ImGui::GetCurrentContext()) @@ -449,31 +447,16 @@ void ImGuiManager::UnloadFontData() ImFont* ImGuiManager::AddTextFont() { - static const ImWchar default_ranges[] = { - // Basic Latin + Latin Supplement + Central European diacritics - 0x0020, - 0x017F, - - // Cyrillic + Cyrillic Supplement - 0x0400, - 0x052F, - - // Cyrillic Extended-A - 0x2DE0, - 0x2DFF, - - // Cyrillic Extended-B - 0xA640, - 0xA69F, - - 0, - }; + // Exclude FA and PF ranges + // clang-format off + static constexpr ImWchar range_exclude_icons[] = { 0x2198,0x2199,0x219e,0x21a7,0x21b0,0x21b3,0x21ba,0x21c3,0x21ce,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21e6,0x21e8,0x21f3,0x21f3,0x21f7,0x21fb,0x2206,0x2208,0x221a,0x221a,0x227a,0x227d,0x22bf,0x22c8,0x2349,0x2349,0x235a,0x2361,0x2364,0x2367,0x237a,0x237f,0x23b2,0x23b5,0x23cc,0x23cc,0x23f4,0x23f7,0x2427,0x243a,0x243d,0x243d,0x2443,0x2443,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24ff,0x2605,0x2605,0x2699,0x2699,0x278a,0x278e,0xff21,0xff3a,0x0,0x0 }; + // clang-format on ImFontConfig cfg; cfg.FontDataOwnedByAtlas = false; + cfg.GlyphExcludeRanges = range_exclude_icons; return ImGui::GetIO().Fonts->AddFontFromMemoryTTF( - s_standard_font_data.data(), static_cast(s_standard_font_data.size()), FONT_BASE_SIZE, &cfg, - s_font_range.empty() ? default_ranges : s_font_range.data()); + s_standard_font_data.data(), static_cast(s_standard_font_data.size()), FONT_BASE_SIZE, &cfg, nullptr); } ImFont* ImGuiManager::AddFixedFont() @@ -486,11 +469,7 @@ ImFont* ImGuiManager::AddFixedFont() bool ImGuiManager::AddIconFonts() { - // clang-format off - static constexpr ImWchar range_fa[] = { 0xe06f,0xe06f,0xe097,0xe097,0xe2ca,0xe2ca,0xe494,0xe494,0xe4bb,0xe4bb,0xe4cf,0xe4cf,0xe51f,0xe51f,0xf001,0xf002,0xf005,0xf005,0xf007,0xf007,0xf009,0xf00a,0xf00c,0xf00d,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01e,0xf01e,0xf022,0xf023,0xf025,0xf028,0xf02b,0xf02b,0xf02e,0xf02e,0xf030,0xf030,0xf037,0xf037,0xf03a,0xf03a,0xf03d,0xf03e,0xf043,0xf043,0xf047,0xf047,0xf04b,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf05a,0xf05a,0xf05e,0xf05e,0xf063,0xf063,0xf066,0xf066,0xf06a,0xf06a,0xf06e,0xf06e,0xf071,0xf071,0xf075,0xf075,0xf077,0xf078,0xf07b,0xf07c,0xf080,0xf080,0xf084,0xf084,0xf08e,0xf08e,0xf091,0xf091,0xf0a0,0xf0a0,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c0,0xf0c0,0xf0c5,0xf0c5,0xf0c7,0xf0c8,0xf0cb,0xf0cb,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0ec,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf11b,0xf11c,0xf120,0xf121,0xf125,0xf125,0xf129,0xf129,0xf140,0xf140,0xf14a,0xf14a,0xf14c,0xf14c,0xf15b,0xf15b,0xf15d,0xf15d,0xf185,0xf185,0xf187,0xf188,0xf191,0xf192,0xf1b3,0xf1b3,0xf1c0,0xf1c0,0xf1da,0xf1da,0xf1de,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fb,0xf1fc,0xf21e,0xf21e,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2a8,0xf2a8,0xf2bd,0xf2bd,0xf2d3,0xf2d3,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf302,0xf303,0xf31e,0xf31e,0xf360,0xf360,0xf3a5,0xf3a5,0xf3c1,0xf3c1,0xf462,0xf462,0xf466,0xf466,0xf49e,0xf49e,0xf4e2,0xf4e2,0xf51f,0xf51f,0xf530,0xf530,0xf54c,0xf54c,0xf552,0xf553,0xf5a2,0xf5a2,0xf5a5,0xf5a5,0xf5bc,0xf5bc,0xf5c7,0xf5c7,0xf624,0xf625,0xf62a,0xf62a,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf70e,0xf70e,0xf756,0xf756,0xf780,0xf780,0xf794,0xf794,0xf7d8,0xf7d8,0xf815,0xf815,0xf84c,0xf84c,0xf87c,0xf87c,0xf8cc,0xf8cc,0x0,0x0 }; - static constexpr ImWchar range_pf[] = { 0x2198,0x2199,0x219e,0x21a7,0x21b0,0x21b3,0x21ba,0x21c3,0x21ce,0x21ce,0x21d0,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21e6,0x21e8,0x21f3,0x21f3,0x21f7,0x21f8,0x21fa,0x21fb,0x2206,0x2208,0x221a,0x221a,0x227a,0x227d,0x22bf,0x22c8,0x2349,0x2349,0x235a,0x235e,0x2360,0x2361,0x2364,0x2367,0x237a,0x237d,0x237f,0x237f,0x23b2,0x23b5,0x23cc,0x23cc,0x23f4,0x23f7,0x2427,0x243a,0x243d,0x243d,0x2443,0x2443,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24fd,0x24ff,0x24ff,0x2605,0x2605,0x2699,0x2699,0x278a,0x278e,0xe000,0xe001,0xff21,0xff3a,0x0,0x0 }; - // clang-format on - + // Load FontAwesome after to avoid aliased codepoints overriding promptfont { ImFontConfig cfg; cfg.MergeMode = true; @@ -500,22 +479,26 @@ bool ImGuiManager::AddIconFonts() cfg.FontDataOwnedByAtlas = false; if (!ImGui::GetIO().Fonts->AddFontFromMemoryTTF( - s_icon_fa_font_data.data(), static_cast(s_icon_fa_font_data.size()), FONT_BASE_SIZE * 0.75f, &cfg, range_fa)) + s_icon_pf_font_data.data(), static_cast(s_icon_pf_font_data.size()), FONT_BASE_SIZE * 1.2f, &cfg, nullptr)) { return false; } } { + // Exclude any characters outside the BMP PUA plane + static constexpr ImWchar range_exclude_non_bmp[] = {0x1, 0xdfff, 0xf900, 0xffff, 0x0, 0x0}; + ImFontConfig cfg; cfg.MergeMode = true; cfg.PixelSnapH = true; cfg.GlyphMinAdvanceX = FONT_BASE_SIZE; cfg.GlyphMaxAdvanceX = FONT_BASE_SIZE; + cfg.GlyphExcludeRanges = range_exclude_non_bmp; cfg.FontDataOwnedByAtlas = false; if (!ImGui::GetIO().Fonts->AddFontFromMemoryTTF( - s_icon_pf_font_data.data(), static_cast(s_icon_pf_font_data.size()), FONT_BASE_SIZE * 1.2f, &cfg, range_pf)) + s_icon_fa_font_data.data(), static_cast(s_icon_fa_font_data.size()), FONT_BASE_SIZE * 0.75f, &cfg, nullptr)) { return false; } diff --git a/pcsx2/ImGui/ImGuiManager.h b/pcsx2/ImGui/ImGuiManager.h index 67dd470c78..7b11d47d85 100644 --- a/pcsx2/ImGui/ImGuiManager.h +++ b/pcsx2/ImGui/ImGuiManager.h @@ -17,7 +17,7 @@ enum class InputLayout : u8; namespace ImGuiManager { /// Sets the path to the font to use. Empty string means to use the default. - void SetFontPathAndRange(std::string path, std::vector range); + void SetFontPath(std::string path); /// Initializes ImGui, creates fonts, etc. bool Initialize(); diff --git a/tools/generate_update_fa_glyph_ranges.py b/tools/generate_update_fa_glyph_ranges.py old mode 100644 new mode 100755 index d3ad11053d..a01b2ad7dd --- a/tools/generate_update_fa_glyph_ranges.py +++ b/tools/generate_update_fa_glyph_ranges.py @@ -32,7 +32,9 @@ all_source_files = list(functools.reduce(lambda prev, src_dir: prev + glob.glob( glob.glob(os.path.join(src_dir, "**", "*.h"), recursive=True) + \ glob.glob(os.path.join(src_dir, "**", "*.inl"), recursive=True), src_dirs, [])) -tokens = set() +# All FA tokens are within a Unicode private area +# PF, however, needs to replace predefined Unicode characters +fa_tokens = set() pf_tokens = set() for filename in all_source_files: data = None @@ -42,11 +44,11 @@ for filename in all_source_files: except: continue - tokens = tokens.union(set(re.findall("(ICON_FA_[a-zA-Z0-9_]+)", data))) + fa_tokens = fa_tokens.union(set(re.findall("(ICON_FA_[a-zA-Z0-9_]+)", data))) pf_tokens = pf_tokens.union(set(re.findall("(ICON_PF_[a-zA-Z0-9_]+)", data))) -print("{}/{} tokens found.".format(len(tokens), len(pf_tokens))) -if len(tokens) == 0 and len(pf_tokens) == 0: +print("{}/{} tokens found.".format(len(fa_tokens), len(pf_tokens))) +if len(pf_tokens) == 0: sys.exit(0) def decode_encoding(value): @@ -58,57 +60,83 @@ def decode_encoding(value): return bytes(value, 'utf-8') -u8_encodings = {} +u8_encodings_fa = {} with open(fa_file, "r") as f: for line in f.readlines(): match = re.match("#define (ICON_FA_[^ ]+) \"([^\"]+)\"", line) if match is None: continue - u8_encodings[match[1]] = decode_encoding(match[2]) + u8_encodings_fa[match[1]] = decode_encoding(match[2]) +u8_encodings_pf = {} with open(pf_file, "r") as f: for line in f.readlines(): match = re.match("#define (ICON_PF_[^ ]+) \"([^\"]+)\"", line) if match is None: continue - u8_encodings[match[1]] = decode_encoding(match[2]) + u8_encodings_pf[match[1]] = decode_encoding(match[2]) -out_pattern = "(static constexpr ImWchar range_fa\[\] = \{)[0-9A-Z_a-z, \n]+(\};)" -out_pf_pattern = "(static constexpr ImWchar range_pf\[\] = \{)[0-9A-Z_a-z, \n]+(\};)" +# PF also uses the Unicode private area, check for conflicts with FA +cf_tokens_all = {} +for pf_token in u8_encodings_pf.keys(): + for fa_token in u8_encodings_fa.keys(): + if u8_encodings_pf[pf_token] == u8_encodings_fa[fa_token]: + cf_tokens_all[pf_token] = fa_token -def get_pairs(tokens): +cf_tokens_used = [] +for token in pf_tokens: + if token in cf_tokens_all: + cf_tokens_used.append(token) + +print("{} font conflicts found, of which we use {} of them.".format(len(cf_tokens_all), len(cf_tokens_used))) +if len(cf_tokens_used) > 0: + raise NotImplementedError("A used PF token conflicts with a FA token, generating exclude ranges is not implemented") + +out_ex_pattern = r"(static constexpr ImWchar range_exclude_icons\[\] = \{)[0-9A-Z_a-z, \n]+(\};)" + +def get_pairs(tokens, limit_pairs=-1): codepoints = list() for token in tokens: - u8_bytes = u8_encodings[token] + u8_bytes = u8_encodings_pf[token] u8 = str(u8_bytes, "utf-8") u16 = u8.encode("utf-16le") if len(u16) > 2: raise ValueError("{} {} too long".format(u8_bytes, token)) codepoint = int.from_bytes(u16, byteorder="little", signed=False) + if codepoint >= 0xe000 and codepoint <= 0xf8ff: + continue codepoints.append(codepoint) codepoints.sort() codepoints.append(0) # null terminator - startc = codepoints[0] - endc = None - pairs = [startc] - for codepoint in codepoints: - if endc is not None and (endc + 1) != codepoint: - pairs.append(endc) - pairs.append(codepoint) - startc = codepoint - endc = codepoint - else: - endc = codepoint - pairs.append(endc) + merge_range = 0 + while True: + merge_range = merge_range + 1 + startc = codepoints[0] + endc = None + pairs = [startc] + for codepoint in codepoints: + if endc is not None and (((endc + merge_range) < codepoint) or (codepoint == 0)): + pairs.append(endc) + pairs.append(codepoint) + startc = codepoint + endc = codepoint + else: + endc = codepoint + pairs.append(endc) + if limit_pairs == -1 or len(pairs) <= (limit_pairs << 1): + break + + print("Created {} pairs with a merge range of {}".format(len(pairs) >> 1, merge_range)) pairs_str = ",".join(list(map("0x{:x}".format, pairs))) return pairs_str with open(dst_file, "r") as f: original = f.read() - updated = re.sub(out_pattern, "\\1 " + get_pairs(tokens) + " \\2", original) - updated = re.sub(out_pf_pattern, "\\1 " + get_pairs(pf_tokens) + " \\2", updated) + # ImGui asserts if more than 32 ranges are provided for exclusion + # we should also use as few as reasonable for performance reasons + updated = re.sub(out_ex_pattern, "\\1 " + get_pairs(pf_tokens, 32) + " \\2", original) if original != updated: with open(dst_file, "w") as f: f.write(updated)