yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of extra string allocations in src/inputmethod.cpp

Browse source
This commit is contained in:
Vlad Zahorodnii 2024-06-17 20:16:35 +03:00
parent c761571a43
commit 0fc6c6800e
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/inputmethod.cpp
View file

@ -550,18 +550,18 @@ void InputMethod::keysymReceived(quint32 serial, quint32 time, quint32 sym, bool
void InputMethod::commitString(qint32 serial, const QString &text) void InputMethod::commitString(qint32 serial, const QString &text)
{ {
if (auto t1 = waylandServer()->seat()->textInputV1(); t1 && t1->isEnabled()) { if (auto t1 = waylandServer()->seat()->textInputV1(); t1 && t1->isEnabled()) {
t1->commitString(text.toUtf8()); t1->commitString(text);
t1->setPreEditCursor(0); t1->setPreEditCursor(0);
t1->preEdit({}, {}); t1->preEdit({}, {});
return; return;
} }
if (auto t2 = waylandServer()->seat()->textInputV2(); t2 && t2->isEnabled()) { if (auto t2 = waylandServer()->seat()->textInputV2(); t2 && t2->isEnabled()) {
t2->commitString(text.toUtf8()); t2->commitString(text);
t2->setPreEditCursor(0); t2->setPreEditCursor(0);
t2->preEdit({}, {}); t2->preEdit({}, {});
return; return;
} else if (auto t3 = waylandServer()->seat()->textInputV3(); t3 && t3->isEnabled()) { } else if (auto t3 = waylandServer()->seat()->textInputV3(); t3 && t3->isEnabled()) {
t3->commitString(text.toUtf8()); t3->commitString(text);
t3->done(); t3->done();
return; return;
} else { } else {
@ -641,11 +641,11 @@ void InputMethod::setLanguage(uint32_t serial, const QString &language)
{ {
auto t1 = waylandServer()->seat()->textInputV1(); auto t1 = waylandServer()->seat()->textInputV1();
if (t1 && t1->isEnabled()) { if (t1 && t1->isEnabled()) {
t1->setLanguage(language.toUtf8()); t1->setLanguage(language);
} }
auto t2 = waylandServer()->seat()->textInputV2(); auto t2 = waylandServer()->seat()->textInputV2();
if (t2 && t2->isEnabled()) { if (t2 && t2->isEnabled()) {
t2->setLanguage(language.toUtf8()); t2->setLanguage(language);
} }
} }
@ -700,11 +700,11 @@ void InputMethod::setPreeditString(uint32_t serial, const QString &text, const Q
{ {
auto t1 = waylandServer()->seat()->textInputV1(); auto t1 = waylandServer()->seat()->textInputV1();
if (t1 && t1->isEnabled()) { if (t1 && t1->isEnabled()) {
t1->preEdit(text.toUtf8(), commit.toUtf8()); t1->preEdit(text, commit);
} }
auto t2 = waylandServer()->seat()->textInputV2(); auto t2 = waylandServer()->seat()->textInputV2();
if (t2 && t2->isEnabled()) { if (t2 && t2->isEnabled()) {
t2->preEdit(text.toUtf8(), commit.toUtf8()); t2->preEdit(text, commit);
} }
auto t3 = waylandServer()->seat()->textInputV3(); auto t3 = waylandServer()->seat()->textInputV3();
if (t3 && t3->isEnabled()) { if (t3 && t3->isEnabled()) {
@ -899,12 +899,12 @@ void InputMethod::startInputMethod()
socket = dup(socket); socket = dup(socket);
QProcessEnvironment environment = kwinApp()->processStartupEnvironment(); QProcessEnvironment environment = kwinApp()->processStartupEnvironment();
environment.insert(QStringLiteral("WAYLAND_SOCKET"), QByteArray::number(socket)); environment.insert(QStringLiteral("WAYLAND_SOCKET"), QString::number(socket));
environment.insert(QStringLiteral("QT_QPA_PLATFORM"), QStringLiteral("wayland")); environment.insert(QStringLiteral("QT_QPA_PLATFORM"), QStringLiteral("wayland"));
// When we use Maliit as virtual keyboard, we want KWin to handle the animation // When we use Maliit as virtual keyboard, we want KWin to handle the animation
// since that works a lot better. So we need to tell Maliit to not do client side // since that works a lot better. So we need to tell Maliit to not do client side
// animation. // animation.
environment.insert(QStringLiteral("MALIIT_ENABLE_ANIMATIONS"), "0"); environment.insert(QStringLiteral("MALIIT_ENABLE_ANIMATIONS"), QStringLiteral("0"));
m_inputMethodProcess = new QProcess(this); m_inputMethodProcess = new QProcess(this);
m_inputMethodProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); m_inputMethodProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);