1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set the composing string of the wayland input method

Browse Source 
Task-number: QTBUG-43346
Change-Id: I9bc6d804ddca59a7a0173b8f0d3ec2f268fe9a59
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
This commit is contained in:
Giulio Camuffo 2015-01-07 22:31:43 +02:00
parent 68a6cf54a0
commit 6723e2148d
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/platforms/wayland/qwaylandinputcontext.cpp
View File

@ -124,6 +124,18 @@ void QWaylandTextInput::updateState()
commit_state(++m_serial);
}
void QWaylandTextInput::text_input_preedit_string(uint32_t serial, const QString &text, const QString &commit)
{
Q_UNUSED(serial)
if (!QGuiApplication::focusObject())
return;
m_commit = commit;
QList<QInputMethodEvent::Attribute> attributes;
QInputMethodEvent event(text, attributes);
QCoreApplication::sendEvent(QGuiApplication::focusObject(), &event);
}
void QWaylandTextInput::text_input_commit_string(uint32_t serial, const QString &text)
{
Q_UNUSED(serial);
@ -133,6 +145,8 @@ void QWaylandTextInput::text_input_commit_string(uint32_t serial, const QString
QInputMethodEvent event;
event.setCommitString(text);
QCoreApplication::sendEvent(QGuiApplication::focusObject(), &event);
m_commit = QString();
}
void QWaylandTextInput::text_input_enter(wl_surface *)
@ -143,6 +157,8 @@ void QWaylandTextInput::text_input_enter(wl_surface *)
void QWaylandTextInput::text_input_leave()
{
if (!m_commit.isEmpty())
text_input_commit_string(0, m_commit);
}
void QWaylandTextInput::text_input_keysym(uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers)

1
src/plugins/platforms/wayland/qwaylandinputcontext_p.h
View File

@ -60,6 +60,7 @@ public:
void updateState();
protected:
void text_input_preedit_string(uint32_t serial, const QString &text, const QString &commit) Q_DECL_OVERRIDE;
void text_input_commit_string(uint32_t serial, const QString &text) Q_DECL_OVERRIDE;
void text_input_enter(wl_surface *surface) Q_DECL_OVERRIDE;
void text_input_leave() Q_DECL_OVERRIDE;