eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-25 17:15:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

servoshell (Linux): Add CJK fonts for egui (#44138)

Browse Source 
Configured fonts for Linux referring to the same pattern used for
Windows in #44055.
CJK font files are loaded from standard system font paths, trying
Noto Sans CJK (Ubuntu/Debian and Fedora/Arch paths) with WenQuanYi
Micro Hei as a fallback. Fonts that are not present on the system
are silently skipped.
Testing: Loaded `cjk_test.html` with the following content in servoshell
on Linux:
  ```html                                 
<!DOCTYPE html>
  <html>                                  
  <head>
  <title>ご利用ガイド - 경애하는</title>
  </head>                               
<body>
  <p>Test</p>
</body>
  </html>                                 
  Before: Tab title showed boxes (□□□□ - □□□□)
After: Tab title renders correctly (ご利用ガイド - 경애하는)
  ```                                    

Fixes part of #44066

---------

Signed-off-by: CynthiaOketch <cynthiaoketch6@gmail.com>
This commit is contained in:
CynthiaOketch
2026-04-13 04:49:26 +03:00
committed by GitHub
parent 3379bf634f
commit 2124599d6b
1 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ports/servoshell/desktop/gui.rs
View File

@@ -3,9 +3,9 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use std::collections::HashMap;
#[cfg(target_os = "windows")]
#[cfg(any(target_os = "windows", target_os = "linux"))]
use std::fs;
#[cfg(target_os = "windows")]
#[cfg(any(target_os = "windows", target_os = "linux"))]
use std::path::Path;
use std::rc::Rc;
use std::sync::Arc;
@@ -17,12 +17,12 @@ use egui::{
Button, FontDefinitions, Id, Key, Label, LayerId, Modifiers, Order, PaintCallback, Panel, Vec2,
WidgetInfo, WidgetType, pos2,
};
#[cfg(target_os = "windows")]
#[cfg(any(target_os = "windows", target_os = "linux"))]
use egui::{FontData, FontFamily};
use egui_glow::{CallbackFn, EguiGlow};
use egui_winit::EventResponse;
use euclid::{Length, Point2D, Rect, Scale, Size2D};
#[cfg(target_os = "windows")]
#[cfg(any(target_os = "windows", target_os = "linux"))]
use log::info;
use log::warn;
use servo::{
@@ -82,14 +82,9 @@ fn truncate_with_ellipsis(input: &str, max_length: usize) -> String {
}
}
#[cfg(target_os = "windows")]
fn configure_fonts() -> FontDefinitions {
#[cfg(any(target_os = "windows", target_os = "linux"))]
fn load_cjk_fonts(font_candidates: &[(&str, &str)]) -> FontDefinitions {
let mut fonts = FontDefinitions::default();
let font_candidates = [
(r"C:\Windows\Fonts\malgun.ttf", "Malgun Gothic"), // Korean
(r"C:\Windows\Fonts\msyh.ttc", "Microsoft YaHei"), // Chinese + Japanese
];
let mut loaded_font_names = Vec::new();
for (path_str, font_name) in font_candidates.iter() {
@@ -97,11 +92,13 @@ fn configure_fonts() -> FontDefinitions {
if font_path.exists() {
match fs::read(font_path) {
Ok(bytes) => {
fonts
.font_data
.insert(font_name.to_string(), Arc::new(FontData::from_owned(bytes)));
loaded_font_names.push(font_name.to_string());
info!("Loaded font: {}", font_name);
if !fonts.font_data.contains_key(*font_name) {
fonts
.font_data
.insert(font_name.to_string(), Arc::new(FontData::from_owned(bytes)));
loaded_font_names.push(font_name.to_string());
info!("Loaded font: {}", font_name);
}
},
Err(error) => {
info!("Failed to read font {}: {}", font_name, error);
@@ -120,10 +117,36 @@ fn configure_fonts() -> FontDefinitions {
fonts
}
#[cfg(not(target_os = "windows"))]
#[cfg(target_os = "windows")]
fn configure_fonts() -> FontDefinitions {
load_cjk_fonts(&[
(r"C:\Windows\Fonts\malgun.ttf", "Malgun Gothic"), // Korean
(r"C:\Windows\Fonts\msyh.ttc", "Microsoft YaHei"), // Chinese + Japanese
])
}
#[cfg(target_os = "linux")]
fn configure_fonts() -> FontDefinitions {
load_cjk_fonts(&[
(
"/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
"Noto Sans CJK",
), // Ubuntu/Debian
(
"/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
"Noto Sans CJK",
), // Fedora/Arch
(
"/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
"WenQuanYi Micro Hei",
), // common fallback
])
}
#[cfg(target_os = "macos")]
fn configure_fonts() -> FontDefinitions {
// TODO: Default proportional fonts: ["Ubuntu-Light", "NotoEmoji-Regular", "emoji-icon-font"]
// does not support CJK. Add them for Mac/Linux.
// does not support CJK. Add them for Mac.
FontDefinitions::default()
}