diff options
| author | AiraYumi <aira.youme@airanyumi.net> | 2024-05-09 23:23:39 +0900 |
|---|---|---|
| committer | AiraYumi <aira.youme@airanyumi.net> | 2024-05-09 23:23:39 +0900 |
| commit | 24e8a0bb5d47f14727ce4d018232d935232469d2 (patch) | |
| tree | 4132770b7c784cef39a65efaad8188a4f2c6d522 | |
| parent | f59af191051bd182806d5cfc77a3e538f02fe129 (diff) | |
enable ime on xwayland (environment setting move)
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 798732e84d..b8b502508b 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -654,11 +654,6 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B SDL_SetHint( std::get<0>(hint), std::get<1>(hint)); } -#if LL_LINUX - // Enable IME on XWayland - setenv("XMODIFIERS", std::string("@im=fcitx;ibus").c_str(), 1); -#endif - std::initializer_list<std::tuple<uint32_t, char const*, bool>> initList= { {SDL_INIT_VIDEO,"SDL_INIT_VIDEO", true}, {SDL_INIT_AUDIO,"SDL_INIT_AUDIO", false}, diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 7d26c81283..a027aaf6d1 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -62,6 +62,10 @@ export SDL_VIDEO_X11_DGAMOUSE=0 if [ "$GTK_IM_MODULE" = "scim" ]; then export GTK_IM_MODULE=xim fi +if [ "$XMODIFIERS" = "" ]; then + ## IME is valid only for fcitx, not when using ibus + export XMODIFIERS="@im=fcitx" +fi ## - Automatically work around the ATI mouse cursor crash bug: ## (this workaround is disabled as most fglrx users do not see the bug) |