Skip to content

Add more Unicode tests to testmessage, improve fallback fonts in X11TK #14042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 24, 2025
Merged

Add more Unicode tests to testmessage, improve fallback fonts in X11TK #14042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b33e11
Add more Unicode tests to testmessage, improve fallback fonts in X11TK
Sep 24, 2025
aba30cc
Add more Unicode tests to testmessage, improve fallback fonts in X11TK
Sep 24, 2025
f6258f9
Update test/testmessage.c
slouken Sep 24, 2025
bdc68b6
Re add blank line
eafton Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/video/x11/SDL_x11toolkit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@ static const char g_ToolkitFontLatin1Fallback[] =
"-*-*-*-*-*--*-*-*-*-*-*-iso8859-1";

static const char *g_ToolkitFont[] = {
"-*-*-medium-r-normal--*-%d-*-*-*-*-iso10646-1", // explicitly unicode (iso10646-1)
"-*-*-medium-r-*--*-%d-*-*-*-*-iso10646-1", // explicitly unicode (iso10646-1)
"-misc-*-*-*-*--*-*-*-*-*-*-iso10646-1", // misc unicode (fix for some systems)
"-*-*-*-*-*--*-*-*-*-*-*-iso10646-1", // just give me anything Unicode.
"-*-*-medium-r-normal--*-%d-*-*-*-*-iso8859-1", // explicitly latin1, in case low-ASCII works out.
"-*-*-medium-r-*--*-%d-*-*-*-*-iso8859-1", // explicitly latin1, in case low-ASCII works out.
"-misc-*-*-*-*--*-*-*-*-*-*-iso8859-1", // misc latin1 (fix for some systems)
"-*-*-*-*-*--*-*-*-*-*-*-iso8859-1", // just give me anything latin1.
"-*-*-medium-r-normal--*-%d-*-*-*-*-iso10646-1,*", // explicitly unicode (iso10646-1)
"-*-*-medium-r-*--*-%d-*-*-*-*-iso10646-1,*", // explicitly unicode (iso10646-1)
"-misc-*-*-*-*--*-*-*-*-*-*-iso10646-1,*", // misc unicode (fix for some systems)
"-*-*-*-*-*--*-*-*-*-*-*-iso10646-1,*", // just give me anything Unicode.
"-*-*-medium-r-normal--*-%d-*-*-*-*-iso8859-1,*", // explicitly latin1, in case low-ASCII works out.
"-*-*-medium-r-*--*-%d-*-*-*-*-iso8859-1,*", // explicitly latin1, in case low-ASCII works out.
"-misc-*-*-*-*--*-*-*-*-*-*-iso8859-1,*", // misc latin1 (fix for some systems)
"-*-*-*-*-*--*-*-*-*-*-*-iso8859-1,*", // just give me anything latin1.
NULL
};
#define G_TOOLKITFONT_SIZE 120
Expand Down
104 changes: 102 additions & 2 deletions test/testmessage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ int main(int argc, char *argv[])
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

/* Google says this is Traditional Chinese for "beef with broccoli" */
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"牛肉西蘭花",
Expand All @@ -193,7 +193,107 @@ int main(int argc, char *argv[])
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}


/* Various other Unicode tests */
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Latin",
"Türkçe özellikle çok güzel bir dil.\nBjörn/Bjørn\nÆgypt",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Arabic",
"يتم استخدام أنظمة الكتابة لتسجيل اللغة البشرية.",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Cyrillic (Ukranian)",
"Для запису людської мови використовуються системи письма.",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Japanese",
"文字体系は人間の言語を記録するために使用されます。",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Indian",
"लेखन प्रणालियों का उपयोग मानव भाषा को रिकॉर्ड करने के लिए किया जाता है।",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Korean",
"문자 체계는 인간의 언어를 기록하는 데 사용됩니다.",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Thai",
"ระบบการเขียนใช้เพื่อบันทึกภาษาของมนุษย์",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Greek",
"Τα συστήματα γραφής χρησιμοποιούνται για την καταγραφή της ανθρώπινης γλώσσας.",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Hebrew",
"מערכות כתיבה משמשות לרישום שפה אנושית.",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Armenian",
"Գրային համակարգերը օգտագործվում են մարդկային լեզուն գրանցելու համար։",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Georgian",
"წერის სისტემები გამოიყენება ადამიანის ენის ჩასაწერად.",
NULL);
if (!success) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
quit(1);
}

button_messagebox(NULL);

/* Test showing a message box from a background thread.
Expand Down
Loading