TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

x11: restore locale after opening input method

Browse Source 
Fixes #728
This commit is contained in:
rdb 2020-02-29 16:59:36 +01:00
parent 9fb60b18e7
commit 7b40a6a0e4
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,13 @@ x11GraphicsPipe(const std::string &display) :
display_spec = ":0.0"; display_spec = ":0.0";
} }
// Store the current locale, so that we can restore it later.
std::string saved_locale;
char *saved_locale_p = setlocale(LC_ALL, nullptr);
if (saved_locale_p != nullptr) {
saved_locale = saved_locale_p;
}
// The X docs say we should do this to get international character support // The X docs say we should do this to get international character support
// from the keyboard. // from the keyboard.
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
@ -338,6 +345,11 @@ x11GraphicsPipe(const std::string &display) :
XFree(im_supported_styles); XFree(im_supported_styles);
*/ */
// Restore the previous locale.
if (!saved_locale.empty()) {
setlocale(LC_ALL, saved_locale.c_str());
}
// Get some X atom numbers. // Get some X atom numbers.
_wm_delete_window = XInternAtom(_display, "WM_DELETE_WINDOW", false); _wm_delete_window = XInternAtom(_display, "WM_DELETE_WINDOW", false);
_net_wm_pid = XInternAtom(_display, "_NET_WM_PID", false); _net_wm_pid = XInternAtom(_display, "_NET_WM_PID", false);