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

virtualkeyboard: update the input panel state when textinput requests it

Browse source 
v1, v2 and v3 protocols supports the update/commit state methods for the
text-input protocol, use it to commit the input method state
This commit is contained in:
Bhushan Shah 2020-09-03 14:15:00 +05:30 committed by Bhushan Shah
parent f93af91327
commit 9fc09b9a32
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
virtualkeyboard.cpp
View file

@ -133,6 +133,7 @@ void VirtualKeyboard::init()
disconnect(m_waylandSurroundingTextConnection); disconnect(m_waylandSurroundingTextConnection);
disconnect(m_waylandResetConnection); disconnect(m_waylandResetConnection);
disconnect(m_waylandEnabledConnection); disconnect(m_waylandEnabledConnection);
disconnect(m_waylandStateCommittedConnection);
if (auto t = waylandServer()->seat()->focusedTextInput()) { if (auto t = waylandServer()->seat()->focusedTextInput()) {
m_waylandShowConnection = connect(t, &TextInputInterface::requestShowInputPanel, this, &VirtualKeyboard::show); m_waylandShowConnection = connect(t, &TextInputInterface::requestShowInputPanel, this, &VirtualKeyboard::show);
m_waylandHideConnection = connect(t, &TextInputInterface::requestHideInputPanel, this, &VirtualKeyboard::hide); m_waylandHideConnection = connect(t, &TextInputInterface::requestHideInputPanel, this, &VirtualKeyboard::hide);
@ -176,6 +177,13 @@ void VirtualKeyboard::init()
hide(); hide();
} }
}); });
m_waylandStateCommittedConnection = connect(t, &TextInputInterface::stateCommitted, this, [t](uint32_t serial) {
auto inputContext = waylandServer()->inputMethod()->context();
if (!inputContext) {
return;
}
inputContext->sendCommitState(serial);
});
auto newClient = waylandServer()->findClient(waylandServer()->seat()->focusedTextInputSurface()); auto newClient = waylandServer()->findClient(waylandServer()->seat()->focusedTextInputSurface());
// Reset the old client virtual keybaord geom if necessary // Reset the old client virtual keybaord geom if necessary
@ -194,6 +202,7 @@ void VirtualKeyboard::init()
m_waylandSurroundingTextConnection = QMetaObject::Connection(); m_waylandSurroundingTextConnection = QMetaObject::Connection();
m_waylandResetConnection = QMetaObject::Connection(); m_waylandResetConnection = QMetaObject::Connection();
m_waylandEnabledConnection = QMetaObject::Connection(); m_waylandEnabledConnection = QMetaObject::Connection();
m_waylandStateCommittedConnection = QMetaObject::Connection();
} }
} }
); );
@ -316,6 +325,7 @@ void VirtualKeyboard::adoptInputMethodContext()
inputContext->sendSurroundingText(QString::fromUtf8(ti->surroundingText()), ti->surroundingTextCursorPosition(), ti->surroundingTextSelectionAnchor()); inputContext->sendSurroundingText(QString::fromUtf8(ti->surroundingText()), ti->surroundingTextCursorPosition(), ti->surroundingTextSelectionAnchor());
inputContext->sendPreferredLanguage(QString::fromUtf8(ti->preferredLanguage())); inputContext->sendPreferredLanguage(QString::fromUtf8(ti->preferredLanguage()));
inputContext->sendContentType(ti->contentHints(), ti->contentPurpose());
connect(inputContext, &KWaylandServer::InputMethodContextV1Interface::keysym, waylandServer(), &keysymReceived); connect(inputContext, &KWaylandServer::InputMethodContextV1Interface::keysym, waylandServer(), &keysymReceived);
connect(inputContext, &KWaylandServer::InputMethodContextV1Interface::commitString, waylandServer(), &commitString); connect(inputContext, &KWaylandServer::InputMethodContextV1Interface::commitString, waylandServer(), &commitString);

2
virtualkeyboard.h
View file

@ -56,6 +56,8 @@ private:
QMetaObject::Connection m_waylandSurroundingTextConnection; QMetaObject::Connection m_waylandSurroundingTextConnection;
QMetaObject::Connection m_waylandResetConnection; QMetaObject::Connection m_waylandResetConnection;
QMetaObject::Connection m_waylandEnabledConnection; QMetaObject::Connection m_waylandEnabledConnection;
QMetaObject::Connection m_waylandStateCommittedConnection;
KWIN_SINGLETON(VirtualKeyboard) KWIN_SINGLETON(VirtualKeyboard)
}; };