diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-09 14:39:38 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-10 08:21:48 +0000 |
commit | 12a6bd37916802d06ac331fcbcd487ad6b4fafe6 (patch) | |
tree | bd8fcec92a04c5f025fa0663d56a5cc724267ec7 /src/compositor/compositor_api/qwaylandkeyboard.cpp | |
parent | 8a7480a80ede5b1f601bccc168e72af75b95ead3 (diff) |
Fix missing sending of modifiers
The joy of shadowing :)
Change-Id: Ie693c700f1527f81991a3d5ff79f7ea22555f467
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandkeyboard.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandkeyboard.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp index 7f725f54f..b61dd562a 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp @@ -53,7 +53,6 @@ #include <sys/types.h> #endif - QT_BEGIN_NAMESPACE QWaylandKeyboardPrivate::QWaylandKeyboardPrivate(QWaylandInputDevice *seat) @@ -196,16 +195,16 @@ void QWaylandKeyboardPrivate::updateModifierState(uint code, uint32_t state) uint32_t modsLocked = xkb_state_serialize_mods(xkb_state, (xkb_state_component)XKB_STATE_LOCKED); uint32_t group = xkb_state_serialize_group(xkb_state, (xkb_state_component)XKB_STATE_EFFECTIVE); - if (modsDepressed == modsDepressed - && modsLatched == modsLatched - && modsLocked == modsLocked - && group == group) + if (this->modsDepressed == modsDepressed + && this->modsLatched == modsLatched + && this->modsLocked == modsLocked + && this->group == group) return; - modsDepressed = modsDepressed; - modsLatched = modsLatched; - modsLocked = modsLocked; - group = group; + this->modsDepressed = modsDepressed; + this->modsLatched = modsLatched; + this->modsLocked = modsLocked; + this->group = group; grab->modifiers(compositor()->nextSerial(), modsDepressed, modsLatched, modsLocked, group); #else |