AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support ForwardKeyEvent signal in ibus input context

Browse Source 
For ibus-hangul, it needs ForwardKeyEvent signal to fix
the commit issue.

[ChangeLog][plugins][ibus] Support ForwardKeyEvent signal

Change-Id: If41e75bed9ec4e3126db05c8ece4a51d2bc3c3fd
Reviewed-by: Takao Fujiwara <takao.fujiwara1@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Peng Wu 2017-11-22 16:08:42 +05:30 committed by Takao Fujiwara
parent e27bb2fd25
commit 8f1b4a9081
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
View File

@ -60,6 +60,10 @@
#ifndef IBUS_RELEASE_MASK #ifndef IBUS_RELEASE_MASK
#define IBUS_RELEASE_MASK (1 << 30) #define IBUS_RELEASE_MASK (1 << 30)
#define IBUS_SHIFT_MASK (1 << 0)
#define IBUS_CONTROL_MASK (1 << 2)
#define IBUS_MOD1_MASK (1 << 3)
#define IBUS_META_MASK (1 << 28)
#endif #endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -307,6 +311,38 @@ void QIBusPlatformInputContext::updatePreeditText(const QDBusVariant &text, uint
d->predit = t.text; d->predit = t.text;
} }
void QIBusPlatformInputContext::forwardKeyEvent(uint keyval, uint keycode, uint state)
{
if (!qApp)
return;
QObject *input = qApp->focusObject();
if (!input)
return;
if (debug)
qDebug() << "forwardKeyEvent" << keyval << keycode << state;
QEvent::Type type = QEvent::KeyPress;
if (state & IBUS_RELEASE_MASK)
type = QEvent::KeyRelease;
state &= ~IBUS_RELEASE_MASK;
Qt::KeyboardModifiers modifiers = Qt::NoModifier;
if (state & IBUS_SHIFT_MASK)
modifiers |= Qt::ShiftModifier;
if (state & IBUS_CONTROL_MASK)
modifiers |= Qt::ControlModifier;
if (state & IBUS_MOD1_MASK)
modifiers |= Qt::AltModifier;
if (state & IBUS_META_MASK)
modifiers |= Qt::MetaModifier;
QKeyEvent event(type, keyval, modifiers, QString(keyval));
QCoreApplication::sendEvent(input, &event);
}
void QIBusPlatformInputContext::surroundingTextRequired() void QIBusPlatformInputContext::surroundingTextRequired()
{ {
if (debug) if (debug)
@ -522,6 +558,7 @@ void QIBusPlatformInputContext::connectToContextSignals()
if (d->context) { if (d->context) {
connect(d->context, SIGNAL(CommitText(QDBusVariant)), SLOT(commitText(QDBusVariant))); connect(d->context, SIGNAL(CommitText(QDBusVariant)), SLOT(commitText(QDBusVariant)));
connect(d->context, SIGNAL(UpdatePreeditText(QDBusVariant,uint,bool)), this, SLOT(updatePreeditText(QDBusVariant,uint,bool))); connect(d->context, SIGNAL(UpdatePreeditText(QDBusVariant,uint,bool)), this, SLOT(updatePreeditText(QDBusVariant,uint,bool)));
connect(d->context, SIGNAL(ForwardKeyEvent(uint, uint, uint)), this, SLOT(forwardKeyEvent(uint, uint, uint)));
connect(d->context, SIGNAL(DeleteSurroundingText(int,uint)), this, SLOT(deleteSurroundingText(int,uint))); connect(d->context, SIGNAL(DeleteSurroundingText(int,uint)), this, SLOT(deleteSurroundingText(int,uint)));
connect(d->context, SIGNAL(RequireSurroundingText()), this, SLOT(surroundingTextRequired())); connect(d->context, SIGNAL(RequireSurroundingText()), this, SLOT(surroundingTextRequired()));
connect(d->context, SIGNAL(HidePreeditText()), this, SLOT(hidePreeditText())); connect(d->context, SIGNAL(HidePreeditText()), this, SLOT(hidePreeditText()));

1
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
View File

@ -100,6 +100,7 @@ public:
public Q_SLOTS: public Q_SLOTS:
void commitText(const QDBusVariant &text); void commitText(const QDBusVariant &text);
void updatePreeditText(const QDBusVariant &text, uint cursor_pos, bool visible); void updatePreeditText(const QDBusVariant &text, uint cursor_pos, bool visible);
void forwardKeyEvent(uint keyval, uint keycode, uint state);
void cursorRectChanged(); void cursorRectChanged();
void deleteSurroundingText(int offset, uint n_chars); void deleteSurroundingText(int offset, uint n_chars);
void surroundingTextRequired(); void surroundingTextRequired();