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

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2020-02-28 15:57:06 +01:00
commit 918d268b80
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/task/Task.py
View File

@ -17,8 +17,12 @@ from direct.showbase.MessengerGlobal import messenger
import types import types
import random import random
import importlib import importlib
import sys
try: try:
if sys.version_info >= (3, 0):
import _signal as signal
else:
import signal import signal
except ImportError: except ImportError:
signal = None signal = None

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

@ -315,10 +315,15 @@ 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) {
// Fall back to internal input method.
XSetLocaleModifiers("@im=none");
_im = XOpenIM(_display, nullptr, nullptr, nullptr);
if (_im == (XIM)nullptr) { if (_im == (XIM)nullptr) {
x11display_cat.warning() x11display_cat.warning()
<< "Couldn't open input method.\n"; << "Couldn't open input method.\n";
} }
}
// What styles does the current input method support? // What styles does the current input method support?
/* /*

6
panda/src/x11display/x11GraphicsWindow.cxx
View File

@ -1119,10 +1119,8 @@ open_window() {
XIM im = x11_pipe->get_im(); XIM im = x11_pipe->get_im();
_ic = nullptr; _ic = nullptr;
if (im) { if (im) {
_ic = XCreateIC _ic = XCreateIC(im, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
(im, XNClientWindow, _xwindow, nullptr);
XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
nullptr);
if (_ic == (XIC)nullptr) { if (_ic == (XIC)nullptr) {
x11display_cat.warning() x11display_cat.warning()
<< "Couldn't create input context.\n"; << "Couldn't create input context.\n";