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] implement target range in edit event

target.diff (text/plain), 6.38 KB, created by tamo on 2019-09-02 14:17:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tamo

Created: 2019-09-02 14:17:35 UTC

Size: 6.38 KB

patch

obsolete

>diff -r 08db6a6f6c23 include/SDL_events.h
>--- a/include/SDL_events.h	Sat Aug 31 22:58:11 2019 +0200
>+++ b/include/SDL_events.h	Mon Sep 02 22:52:36 2019 +0900
>@@ -230,8 +230,10 @@
>     Uint32 timestamp;                           /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;                            /**< The window with keyboard focus, if any */
>     char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
>-    Sint32 start;                               /**< The start cursor of selected editing text */
>-    Sint32 length;                              /**< The length of selected editing text */
>+    Sint32 start;                               /**< The cursor, where reading text starts if any */
>+    Sint32 length;                              /**< The length of reading text */
>+    Uint16 target_start;                        /**< The starting point of editing part */
>+    Uint16 target_length;                       /**< The length of editing part */
> } SDL_TextEditingEvent;
> 
> 
>diff -r 08db6a6f6c23 src/events/SDL_keyboard.c
>--- a/src/events/SDL_keyboard.c	Sat Aug 31 22:58:11 2019 +0200
>+++ b/src/events/SDL_keyboard.c	Mon Sep 02 22:52:36 2019 +0900
>@@ -809,7 +809,7 @@
> }
> 
> int
>-SDL_SendEditingText(const char *text, int start, int length)
>+SDL_SendEditingText(const char *text, int start, int length, Uint16 target_start, Uint16 target_length)
> {
>     SDL_Keyboard *keyboard = &SDL_keyboard;
>     int posted;
>@@ -822,6 +822,8 @@
>         event.edit.windowID = keyboard->focus ? keyboard->focus->id : 0;
>         event.edit.start = start;
>         event.edit.length = length;
>+        event.edit.target_start = target_start;
>+        event.edit.target_length = target_length;
>         SDL_utf8strlcpy(event.edit.text, text, SDL_arraysize(event.edit.text));
>         posted = (SDL_PushEvent(&event) > 0);
>     }
>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 22:52:36 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 read_start, int read_length, Uint16 target_start, Uint16 target_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 22:52:36 2019 +0900
>@@ -64,6 +64,8 @@
>     data->ime_composition[0] = 0;
>     data->ime_readingstring[0] = 0;
>     data->ime_cursor = 0;
>+    data->ime_target_start = 0;
>+    data->ime_target_length = 0;
> 
>     data->ime_candlist = SDL_FALSE;
>     SDL_memset(data->ime_candidates, 0, sizeof(data->ime_candidates));
>@@ -723,7 +725,7 @@
> 
>     ImmNotifyIME(himc, NI_CLOSECANDIDATE, 0, 0);
>     ImmReleaseContext(videodata->ime_hwnd_current, himc);
>-    SDL_SendEditingText("", 0, 0);
>+    SDL_SendEditingText("", 0, 0, 0, 0);
> }
> 
> static void
>@@ -743,6 +745,19 @@
>         --length;
>     }
>     videodata->ime_composition[length] = 0;
>+
>+    LONG attrs_size = ImmGetCompositionStringW(himc, GCS_COMPATTR, NULL, 0);
>+    if (attrs_size) {
>+        char* attrs = (char *)SDL_calloc(attrs_size, sizeof(char));
>+        ImmGetCompositionStringW(himc, GCS_COMPATTR, attrs, attrs_size);
>+        Uint16 i;
>+        for (i = 0; i < attrs_size / sizeof(attrs[0]) &&
>+            attrs[i] != ATTR_TARGET_CONVERTED && attrs[i] != ATTR_TARGET_NOTCONVERTED; i++);
>+        videodata->ime_target_start = i;
>+        for (; i < attrs_size / sizeof(attrs[0]) &&
>+            attrs[i] == ATTR_TARGET_CONVERTED || attrs[i] == ATTR_TARGET_NOTCONVERTED; i++);
>+        videodata->ime_target_length = i - videodata->ime_target_start;
>+    }
> }
> 
> static void
>@@ -762,20 +777,29 @@
> IME_SendEditingEvent(SDL_VideoData *videodata)
> {
>     char *s = 0;
>+    size_t cursor;
>     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);
>-        SDL_wcslcpy(buffer, videodata->ime_composition, len + 1);
>-        SDL_wcslcat(buffer, videodata->ime_readingstring, size);
>-        SDL_wcslcat(buffer, &videodata->ime_composition[len], size);
>+        cursor = SDL_min(SDL_wcslen(videodata->ime_composition), (size_t)videodata->ime_cursor);
>+        SDL_wcslcpy(buffer, videodata->ime_composition, cursor + 1);
>+        const size_t rlen = SDL_wcslcat(buffer, videodata->ime_readingstring, size);
>+        SDL_wcslcat(buffer, &videodata->ime_composition[cursor], size);
>+        const int d = videodata->ime_target_start - cursor;
>+        if (d >= 0)
>+            videodata->ime_target_start += rlen;
>+        else {
>+            if (-d < videodata->ime_target_length)
>+                videodata->ime_target_length += rlen;
>+        }
>     }
>     else {
>+        cursor = 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)cursor, (int)SDL_wcslen(videodata->ime_readingstring), videodata->ime_target_start, videodata->ime_target_length);
>     SDL_free(s);
> }
> 
>@@ -904,7 +928,7 @@
>         videodata->ime_composition[0] = 0;
>         videodata->ime_readingstring[0] = 0;
>         videodata->ime_cursor = 0;
>-        SDL_SendEditingText("", 0, 0);
>+        SDL_SendEditingText("", 0, 0, 0, 0);
>         break;
>     case WM_IME_NOTIFY:
>         switch (wParam) {
>diff -r 08db6a6f6c23 src/video/windows/SDL_windowsvideo.h
>--- a/src/video/windows/SDL_windowsvideo.h	Sat Aug 31 22:58:11 2019 +0200
>+++ b/src/video/windows/SDL_windowsvideo.h	Mon Sep 02 22:52:36 2019 +0900
>@@ -153,6 +153,8 @@
>     WCHAR ime_composition[SDL_TEXTEDITINGEVENT_TEXT_SIZE];
>     WCHAR ime_readingstring[16];
>     int ime_cursor;
>+    Uint16 ime_target_start;
>+    Uint16 ime_target_length;
> 
>     SDL_bool ime_candlist;
>     WCHAR ime_candidates[MAX_CANDLIST][MAX_CANDLENGTH];

Actions: View | Diff

Attachments on bug 4783: 3945

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.