TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

x11: fall back to @im=none if XOpenIM failed

Browse Source 
This helps if the user has configured an invalid input method in their XMODIFIERS variable.
This commit is contained in:
rdb 2020-02-28 15:53:21 +01:00
parent b225a3260b
commit 4383fceba2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/x11display/x11GraphicsPipe.cxx
View File

@ -278,8 +278,13 @@ x11GraphicsPipe(const std::string &display) :
// Connect to an input method for supporting international text entry. // Connect to an input method for supporting international text entry.
_im = XOpenIM(_display, nullptr, nullptr, nullptr); _im = XOpenIM(_display, nullptr, nullptr, nullptr);
if (_im == (XIM)nullptr) { if (_im == (XIM)nullptr) {
x11display_cat.warning() // Fall back to internal input method.
<< "Couldn't open input method.\n"; XSetLocaleModifiers("@im=none");
_im = XOpenIM(_display, nullptr, nullptr, nullptr);
if (_im == (XIM)nullptr) {
x11display_cat.warning()
<< "Couldn't open input method.\n";
}
} }
// What styles does the current input method support? // What styles does the current input method support?