Merge 931d232 into e8b6c0b

cefsharp · Jan 17, 2018 · 5b38163 · 5b38163
2 parents e8b6c0b + 931d232
commit 5b38163
Show file tree

Hide file tree

Showing 11 changed files with 858 additions and 36 deletions.
diff --git a/CefSharp.Core/CefSharp.Core.vcxproj b/CefSharp.Core/CefSharp.Core.vcxproj
@@ -238,6 +238,8 @@
     <ClCompile Include="Internals\Serialization\V8Serialization.cpp" />
     <ClCompile Include="Internals\Serialization\Primitives.cpp" />
     <ClCompile Include="Internals\Serialization\JsObjectsSerialization.cpp" />
+    <ClCompile Include="OsrImeHandler.cpp" />
+    <ClCompile Include="OsrImeWin.cpp" />
     <ClCompile Include="ResourceHandlerWrapper.cpp" />
     <ClCompile Include="Stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -279,6 +281,8 @@
     <ClInclude Include="Internals\CefTaskScheduler.h" />
     <ClInclude Include="Internals\CefTaskWrapper.h" />
     <ClInclude Include="Internals\CefWrapper.h" />
+    <ClInclude Include="OsrImeHandler.h" />
+    <ClInclude Include="OsrImeWin.h" />
     <ClInclude Include="PopupFeatures.h" />
     <ClInclude Include="RequestContextHandler.h" />
     <ClInclude Include="resource.h" />

diff --git a/CefSharp.Core/CefSharp.Core.vcxproj.filters b/CefSharp.Core/CefSharp.Core.vcxproj.filters
@@ -71,6 +71,12 @@
     <ClCompile Include="CookieManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="OsrImeHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OsrImeWin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="vcclr_local.h">
@@ -271,6 +277,12 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="OsrImeHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OsrImeWin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Internals\CefSharpBrowserWrapper.h">

diff --git a/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp b/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp
@@ -336,12 +336,30 @@ void CefBrowserHostWrapper::ImeSetComposition(String^ text, cli::array<Compositi
     _browserHost->ImeSetComposition(StringUtils::ToNative(text), underlinesVector, CefRange(), range);
 }
 
+void CefBrowserHostWrapper::ImeSetComposition(
+	const CefString& text,
+	const std::vector<CefCompositionUnderline>& underlines,
+	const CefRange& replacement_range,
+	const CefRange& selection_range) {
+
+	ThrowIfDisposed();
+	_browserHost->ImeSetComposition(text, underlines, replacement_range, selection_range);
+}
+
 void CefBrowserHostWrapper::ImeCommitText(String^ text)
 {
-    ThrowIfDisposed();
+	ThrowIfDisposed();
+
+	//Range and cursor position are Mac OSX only
+	_browserHost->ImeCommitText(StringUtils::ToNative(text), CefRange(), NULL);
+}
+
+void CefBrowserHostWrapper::ImeCommitText(const CefString& text,
+	const CefRange& replacement_range,
+	int relative_cursor_pos) {
 
-    //Range and cursor position are Mac OSX only
-    _browserHost->ImeCommitText(StringUtils::ToNative(text), CefRange(), NULL);
+	ThrowIfDisposed();
+	_browserHost->ImeCommitText(text, replacement_range, relative_cursor_pos);
 }
 
 void CefBrowserHostWrapper::ImeFinishComposingText(bool keepSelection)

diff --git a/CefSharp.Core/Internals/CefBrowserHostWrapper.h b/CefSharp.Core/Internals/CefBrowserHostWrapper.h
@@ -1,4 +1,4 @@
-// Copyright © 2010-2017 The CefSharp Authors. All rights reserved.
+// Copyright ?2010-2017 The CefSharp Authors. All rights reserved.
 //
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
@@ -83,7 +83,9 @@ namespace CefSharp
             virtual void Invalidate(PaintElementType type);
 
             virtual void ImeSetComposition(String^ text, cli::array<CompositionUnderline>^ underlines, Nullable<Range> selectionRange);
-            virtual void ImeCommitText(String^ text);
+			virtual void ImeSetComposition(const CefString& text, const std::vector<CefCompositionUnderline>& underlines, const CefRange& replacement_range, const CefRange& selection_range);
+			virtual void ImeCommitText(String^ text);
+            virtual void ImeCommitText(const CefString& text, const CefRange& replacement_range, int relative_cursor_pos);
             virtual void ImeFinishComposingText(bool keepSelection);
             virtual void ImeCancelComposition();