IME: better support

xfangfang · Dec 14, 2023 · 6545d6f · 6545d6f
1 parent d4458e1
commit 6545d6f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/library/borealis b/library/borealis
diff --git a/scripts/psv/sdl2/VITABUILD b/scripts/psv/sdl2/VITABUILD
@@ -1,17 +1,20 @@
 pkgname=sdl2
-pkgver=2.28.1
+pkgver=2.28.5
 pkgrel=1
-gitrev=4761467b2e8cc7db3d6bc98747daca0051858f09
+gitrev=15ead9a40d09a1eb9972215cceac2bf29c9b77f6
 url='https://www.libsdl.org'
 source=(
   "https://github.com/libsdl-org/SDL/archive/${gitrev}.tar.gz"
+  "ime.patch"
  )
 sha256sums=(
   SKIP
+  SKIP
 )
 
 prepare() {
   cd "SDL-${gitrev}"
+  patch --strip=1 --input=${srcdir}/ime.patch
 }
 
 build() {
@@ -22,7 +25,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DVIDEO_VITA_PVR=ON \
     -DSDL_TEST=OFF
-  make -j$(nproc)
+  make -j12
 }
 
 package () {

diff --git a/scripts/psv/sdl2/ime.patch b/scripts/psv/sdl2/ime.patch
@@ -0,0 +1,24 @@
+diff --git a/src/video/vita/SDL_vitavideo.c b/src/video/vita/SDL_vitavideo.c
+index 9e823996e..f887ca4d0 100644
+--- a/src/video/vita/SDL_vitavideo.c
++++ b/src/video/vita/SDL_vitavideo.c
+@@ -438,16 +438,11 @@ void VITA_ImeEventHandler(void *arg, const SceImeEventData *e)
+     switch (e->id) {
+     case SCE_IME_EVENT_UPDATE_TEXT:
+         if (e->param.text.caretIndex == 0) {
+-            SDL_SendKeyboardKeyAutoRelease(SDL_SCANCODE_BACKSPACE);
++            SDL_SendKeyboardKeyAutoRelease(SDL_SCANCODE_ESCAPE);
+             sceImeSetText((SceWChar16 *)libime_initval, 4);
+         } else {
+-            scancode = SDL_GetScancodeFromKey(*(SceWChar16 *)&libime_out[1]);
+-            if (scancode == SDL_SCANCODE_SPACE) {
+-                SDL_SendKeyboardKeyAutoRelease(SDL_SCANCODE_SPACE);
+-            } else {
+-                utf16_to_utf8((SceWChar16 *)&libime_out[1], utf8_buffer);
+-                SDL_SendKeyboardText((const char *)utf8_buffer);
+-            }
++            utf16_to_utf8((SceWChar16 *)&libime_out[1], utf8_buffer);
++            SDL_SendKeyboardText((const char *)utf8_buffer);
+             SDL_memset(&caret_rev, 0, sizeof(SceImeCaret));
+             SDL_memset(libime_out, 0, ((SCE_IME_MAX_PREEDIT_LENGTH + SCE_IME_MAX_TEXT_LENGTH + 1) * sizeof(SceWChar16)));
+             caret_rev.index = 1;
diff --git a/wiliwili/source/activity/player_base_activity.cpp b/wiliwili/source/activity/player_base_activity.cpp
@@ -72,7 +72,8 @@ class DataSourceCommentList : public RecyclingGridDataSource,
             if (!DialogHelper::checkLogin()) return;
             // 回复评论
             brls::Application::getImeManager()->openForText(
-                [this, recycler](std::string text) {
+                [this, recycler](const std::string& text) {
+                    if (text.empty()) return ;
                     this->commentReply(
                         text, aid, 0, 0,
                         [this, recycler](
+2 −0		library/include/borealis/platforms/glfw/glfw_ime.hpp
+1 −0		library/include/borealis/views/hint.hpp
+6 −5		library/include/borealis/views/label.hpp
+1 −1		library/lib/extern/SDL
+54 −8		library/lib/platforms/glfw/glfw_ime.cpp
+5 −2		library/lib/platforms/sdl/sdl_ime.cpp
+31 −2		library/lib/platforms/sdl/sdl_input.cpp
+1 −1		library/lib/platforms/switch/switch_ime.cpp
+2 −0		library/lib/views/edit_text_dialog.cpp
+5 −3		library/lib/views/hint.cpp
+8 −1		library/lib/views/label.cpp