mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Assume X11 UTF-8 support is present

Browse Source
This commit is contained in:
Chris Thrasher 2024-05-28 06:38:00 +00:00
parent 46a71e4fe8
commit 2c443d143b
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/SFML/Window/Unix/WindowImplX11.cpp
View File

@ -927,8 +927,7 @@ void WindowImplX11::setTitle(const String& title)
utf8Title.c_str(), utf8Title.c_str(),
static_cast<int>(utf8Title.size())); static_cast<int>(utf8Title.size()));
// Set the non-Unicode title as a fallback for window managers who don't support _NET_WM_NAME. // Set the non-Unicode title as a fallback for window managers who don't support _NET_WM_NAME.
#ifdef X_HAVE_UTF8_STRING
Xutf8SetWMProperties(m_display.get(), Xutf8SetWMProperties(m_display.get(),
m_window, m_window,
title.toAnsiString().c_str(), title.toAnsiString().c_str(),
@ -938,17 +937,6 @@ void WindowImplX11::setTitle(const String& title)
nullptr, nullptr,
nullptr, nullptr,
nullptr); nullptr);
#else
XmbSetWMProperties(m_display.get(),
m_window,
title.toAnsiString().c_str(),
title.toAnsiString().c_str(),
nullptr,
0,
nullptr,
nullptr,
nullptr);
#endif
} }
@ -1816,7 +1804,6 @@ bool WindowImplX11::processEvent(XEvent& windowEvent)
// Generate TextEntered events if needed // Generate TextEntered events if needed
if (!filtered) if (!filtered)
{ {
#ifdef X_HAVE_UTF8_STRING
if (m_inputContext) if (m_inputContext)
{ {
Status status = 0; Status status = 0;
@ -1849,7 +1836,6 @@ bool WindowImplX11::processEvent(XEvent& windowEvent)
} }
} }
else else
#endif
{ {
static XComposeStatus status; static XComposeStatus status;
char keyBuffer[16]; char keyBuffer[16];