summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qtwindowsglobal.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-08-24 09:30:29 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-08-24 11:16:19 +0200
commit1b2dae36d32bc4d37fa8a12653becd810101f82e (patch)
tree95a1d3159d1a3003528731b7c4987c2ba92f95be /src/plugins/platforms/windows/qtwindowsglobal.h
parentf5777742126d5fb025522d1528d7e12d7239a03f (diff)
Add Input context for Windows.
Change-Id: I20b97e863bf1198b9ad810bb5a25652327f626c9 Reviewed-on: http://codereview.qt.nokia.com/3463 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qtwindowsglobal.h')
-rw-r--r--src/plugins/platforms/windows/qtwindowsglobal.h23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qtwindowsglobal.h b/src/plugins/platforms/windows/qtwindowsglobal.h
index 792792a136..692489dfc6 100644
--- a/src/plugins/platforms/windows/qtwindowsglobal.h
+++ b/src/plugins/platforms/windows/qtwindowsglobal.h
@@ -88,6 +88,12 @@ enum WindowsEventType // Simplify event types
ClipboardEvent = ClipboardEventFlag + 1,
ActivateApplicationEvent = ApplicationEventFlag + 1,
DeactivateApplicationEvent = ApplicationEventFlag + 2,
+ InputMethodStartCompositionEvent = InputMethodEventFlag + 1,
+ InputMethodCompositionEvent = InputMethodEventFlag + 2,
+ InputMethodEndCompositionEvent = InputMethodEventFlag + 3,
+ InputMethodOpenCandidateWindowEvent = InputMethodEventFlag + 4,
+ InputMethodCloseCandidateWindowEvent = InputMethodEventFlag + 5,
+ InputMethodRequest = InputMethodEventFlag + 6,
UnknownEvent = 542
};
@@ -143,6 +149,23 @@ inline QtWindows::WindowsEventType windowsEventType(UINT message, WPARAM wParamI
case WM_RENDERALLFORMATS:
case WM_DESTROYCLIPBOARD:
return QtWindows::ClipboardEvent;
+ case WM_IME_STARTCOMPOSITION:
+ return QtWindows::InputMethodStartCompositionEvent;
+ case WM_IME_ENDCOMPOSITION:
+ return QtWindows::InputMethodEndCompositionEvent;
+ case WM_IME_COMPOSITION:
+ return QtWindows::InputMethodCompositionEvent;
+ case WM_IME_REQUEST:
+ return QtWindows::InputMethodRequest;
+ case WM_IME_NOTIFY:
+ switch (int(wParamIn)) {
+ case IMN_OPENCANDIDATE:
+ return QtWindows::InputMethodOpenCandidateWindowEvent;
+ case IMN_CLOSECANDIDATE:
+ return QtWindows::InputMethodCloseCandidateWindowEvent;
+ default:
+ break;
+ }
default:
break;
}