Added in explicit touchscreen keyboard support. (#1389)

This commit is contained in:
Adam 2023-04-07 12:42:46 -04:00 committed by George Sokianos
parent 1c8c569fae
commit ee80b451c6
6 changed files with 29 additions and 2 deletions

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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,6 +1111,7 @@ 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 }
};

View File

@ -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"