Merge pull request #1042 from uhuntu/patch

SDL_DISABLE_WINDOWS_IME
Rust-SDL2 · Dec 2, 2020 · 7a491ef · 7a491ef
2 parents d345d4c + 5bfe72c
commit 7a491ef
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/sdl2-sys/build.rs b/sdl2-sys/build.rs
@@ -155,6 +155,10 @@ fn patch_sdl2(sdl2_source_path: &Path) {
         // Expected to be fixed in 2.0.14
         ("SDL2-2.0.12-sndio-shared-linux.patch", include_str!("patches/SDL2-2.0.12-sndio-shared-linux.patch")),
 
+        // https://bugzilla.libsdl.org/show_bug.cgi?id=3421
+        // Expected to be fixed in 2.0.14
+        ("SDL2-2.0.12-SDL_DISABLE_WINDOWS_IME.patch", include_str!("patches/SDL2-2.0.12-SDL_DISABLE_WINDOWS_IME.patch")),
+
         // https://bugzilla.libsdl.org/show_bug.cgi?id=4988
         // Expected to be fixed in 2.0.14
         ("SDL2-2.0.12-metal-detection-macos-ios.patch", include_str!("patches/SDL2-2.0.12-metal-detection-macos-ios.patch"))

diff --git a/sdl2-sys/patches/SDL2-2.0.12-SDL_DISABLE_WINDOWS_IME.patch b/sdl2-sys/patches/SDL2-2.0.12-SDL_DISABLE_WINDOWS_IME.patch
@@ -0,0 +1,12 @@
+diff -r 355a4f94a782 src/video/windows/SDL_windowskeyboard.c
+--- a/src/video/windows/SDL_windowskeyboard.c
++++ b/src/video/windows/SDL_windowskeyboard.c
+@@ -30,6 +30,8 @@
+ #include <imm.h>
+ #include <oleauto.h>
+
++#define SDL_DISABLE_WINDOWS_IME
++
+ #ifndef SDL_DISABLE_WINDOWS_IME
+ static void IME_Init(SDL_VideoData *videodata, HWND hwnd);
+ static void IME_Enable(SDL_VideoData *videodata, HWND hwnd);