From 1a0d3a4a0322280e868fe3fd2e1f672953d60109 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 7 Apr 2023 12:42:46 -0400 Subject: [PATCH] Added in explicit touchscreen keyboard support. (#1389) --- data/core/commandview.lua | 5 +++++ data/core/docview.lua | 5 +++++ data/core/init.lua | 1 + data/core/view.lua | 4 ++++ src/api/system.c | 14 ++++++++++++-- src/main.c | 2 ++ 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/data/core/commandview.lua b/data/core/commandview.lua index 1f388678..dd2c5e42 100644 --- a/data/core/commandview.lua +++ b/data/core/commandview.lua @@ -84,6 +84,11 @@ function CommandView:get_line_screen_position(line, col) end +function CommandView:supports_text_input() + return true +end + + function CommandView:get_scrollable_size() return 0 end diff --git a/data/core/docview.lua b/data/core/docview.lua index 908d7c6a..7b04dba4 100644 --- a/data/core/docview.lua +++ b/data/core/docview.lua @@ -252,6 +252,11 @@ function DocView:scroll_to_line(line, ignore_if_visible, instant) end +function DocView:supports_text_input() + return true +end + + function DocView:scroll_to_make_visible(line, col) local ox, oy = self:get_content_offset() local _, ly = self:get_line_screen_position(line, col) diff --git a/data/core/init.lua b/data/core/init.lua index 1aba9ff7..8c9dafcc 100644 --- a/data/core/init.lua +++ b/data/core/init.lua @@ -1105,6 +1105,7 @@ function core.set_active_view(view) -- Reset the IME even if the focus didn't change ime.stop() if view ~= core.active_view then + system.text_input(view:supports_text_input()) if core.active_view and core.active_view.force_focus then core.next_active_view = view return diff --git a/data/core/view.lua b/data/core/view.lua index 77378b90..36580677 100644 --- a/data/core/view.lua +++ b/data/core/view.lua @@ -108,6 +108,10 @@ function View:get_h_scrollable_size() end +function View:supports_text_input() + return false +end + ---@param x number ---@param y number ---@return boolean diff --git a/src/api/system.c b/src/api/system.c index ad7cede8..9da499a6 100644 --- a/src/api/system.c +++ b/src/api/system.c @@ -966,7 +966,7 @@ static int f_library_gc(lua_State *L) { lua_getfield(L, 1, "handle"); void* handle = lua_touserdata(L, -1); SDL_UnloadObject(handle); - + return 0; } @@ -1069,6 +1069,15 @@ static int f_path_compare(lua_State *L) { } +static int f_text_input(lua_State* L) { + if (lua_toboolean(L, 1)) + SDL_StartTextInput(); + else + SDL_StopTextInput(); + return 0; +} + + static const luaL_Reg lib[] = { { "poll_event", f_poll_event }, { "wait_event", f_wait_event }, @@ -1102,12 +1111,13 @@ static const luaL_Reg lib[] = { { "load_native_plugin", f_load_native_plugin }, { "path_compare", f_path_compare }, { "get_fs_type", f_get_fs_type }, + { "text_input", f_text_input }, { NULL, NULL } }; int luaopen_system(lua_State *L) { - luaL_newmetatable(L, API_TYPE_NATIVE_PLUGIN); + luaL_newmetatable(L, API_TYPE_NATIVE_PLUGIN); lua_pushcfunction(L, f_library_gc); lua_setfield(L, -2, "__gc"); luaL_newlib(L, lib); diff --git a/src/main.c b/src/main.c index ab2da5ca..e433fe18 100644 --- a/src/main.c +++ b/src/main.c @@ -212,6 +212,8 @@ init_lua: set_macos_bundle_resources(L); #endif #endif + SDL_EventState(SDL_TEXTINPUT, SDL_ENABLE); + SDL_EventState(SDL_TEXTEDITING, SDL_ENABLE); const char *init_lite_code = \ "local core\n"