We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] fix header and indent

4782.diff (text/plain), 1.89 KB, created by tamo on 2019-09-02 07:31:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tamo

Created: 2019-09-02 07:31:09 UTC

Size: 1.89 KB

patch

obsolete

>diff -r 08db6a6f6c23 src/events/SDL_keyboard_c.h
>--- a/src/events/SDL_keyboard_c.h	Sat Aug 31 22:58:11 2019 +0200
>+++ b/src/events/SDL_keyboard_c.h	Mon Sep 02 16:18:23 2019 +0900
>@@ -53,8 +53,8 @@
> /* Send keyboard text input */
> extern int SDL_SendKeyboardText(const char *text);
> 
>-/* Send editing text for selected range from start to end */
>-extern int SDL_SendEditingText(const char *text, int start, int end);
>+/* Send editing text which may contain a reading string in specified length from start */
>+extern int SDL_SendEditingText(const char *text, int start, int length);
> 
> /* Shutdown the keyboard subsystem */
> extern void SDL_KeyboardQuit(void);
>diff -r 08db6a6f6c23 src/video/windows/SDL_windowskeyboard.c
>--- a/src/video/windows/SDL_windowskeyboard.c	Sat Aug 31 22:58:11 2019 +0200
>+++ b/src/video/windows/SDL_windowskeyboard.c	Mon Sep 02 16:18:23 2019 +0900
>@@ -762,20 +762,22 @@
> IME_SendEditingEvent(SDL_VideoData *videodata)
> {
>     char *s = 0;
>+    size_t len;
>     WCHAR buffer[SDL_TEXTEDITINGEVENT_TEXT_SIZE];
>     const size_t size = SDL_arraysize(buffer);
>     buffer[0] = 0;
>     if (videodata->ime_readingstring[0]) {
>-        size_t len = SDL_min(SDL_wcslen(videodata->ime_composition), (size_t)videodata->ime_cursor);
>+        len = SDL_min(SDL_wcslen(videodata->ime_composition), (size_t)videodata->ime_cursor);
>         SDL_wcslcpy(buffer, videodata->ime_composition, len + 1);
>         SDL_wcslcat(buffer, videodata->ime_readingstring, size);
>         SDL_wcslcat(buffer, &videodata->ime_composition[len], size);
>     }
>     else {
>+        len = SDL_wcslen(videodata->ime_composition);
>         SDL_wcslcpy(buffer, videodata->ime_composition, size);
>     }
>     s = WIN_StringToUTF8(buffer);
>-    SDL_SendEditingText(s, videodata->ime_cursor + (int)SDL_wcslen(videodata->ime_readingstring), 0);
>+    SDL_SendEditingText(s, (int)len, (int)SDL_wcslen(videodata->ime_readingstring));
>     SDL_free(s);
> }
>

Actions: View | Diff

Attachments on bug 4782: 3940 | 3941 | 3942 | 3943 | 3944

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.