virt keyboard

Author: igagis

src/ruisapp/application.cpp

@@ -96,24 +96,6 @@ std::unique_ptr<papki::file> application::get_res_file(std::string_view path) co
 {
 	return std::make_unique<papki::fs_file>(path);
 }
-
-#	if CFG_OS_NAME != CFG_OS_NAME_EMSCRIPTEN
-void application::show_virtual_keyboard() noexcept
-{
-	utki::log_debug([](auto& o) {
-		o << "application::show_virtual_keyboard(): invoked" << std::endl;
-	});
-	// do nothing
-}
-
-void application::hide_virtual_keyboard() noexcept
-{
-	utki::log_debug([](auto& o) {
-		o << "application::hide_virtual_keyboard(): invoked" << std::endl;
-	});
-	// do nothing
-}
-#	endif
 #endif
 
 ruis::real application::get_pixels_per_pp(

src/ruisapp/application.hpp

@@ -158,22 +158,6 @@ class application : public utki::intrusive_singleton<application>
 
 	~application() override;
 
-	/**
-	 * @brief Bring up the virtual keyboard.
-	 * On mobile platforms this function will summon the on-screen keyboard.
-	 * On desktop platforms this function does nothing.
-	 */
-	// TODO: move to window?
-	void show_virtual_keyboard() noexcept;
-
-	/**
-	 * @brief Hide virtual keyboard.
-	 * On mobile platforms this function hides the on-screen keyboard.
-	 * On desktop platforms this function does nothing.
-	 */
-	// TODO: move to window?
-	void hide_virtual_keyboard() noexcept;
-
 public:
 	/**
 	 * @brief Requests application to exit.

src/ruisapp/glue/android/application.cxx

@@ -182,25 +182,3 @@ void ruisapp::application::quit() noexcept
 	utki::assert(globals_wrapper::native_activity, SL);
 	ANativeActivity_finish(globals_wrapper::native_activity);
 }
-
-void ruisapp::application::show_virtual_keyboard() noexcept
-{
-	// NOTE:
-	// ANativeActivity_showSoftInput(native_activity,
-	// ANATIVEACTIVITY_SHOW_SOFT_INPUT_FORCED); did not work for some reason.
-
-	auto& glob = get_glob();
-
-	glob.java_functions.show_virtual_keyboard();
-}
-
-void ruisapp::application::hide_virtual_keyboard() noexcept
-{
-	// NOTE:
-	// ANativeActivity_hideSoftInput(native_activity,
-	// ANATIVEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS); did not work for some reason
-
-	auto& glob = get_glob();
-
-	glob.java_functions.hide_virtual_keyboard();
-}

src/ruisapp/glue/android/window.cxx

@@ -168,3 +168,22 @@ void native_window::set_fullscreen_internal(bool enable)
 		);
 	}
 }
+
+void naitve_window::set_virtual_keyboard_visible(bool visible) noexcept
+{
+	auto& glob = get_glob();
+
+	if (visible) {
+		// NOTE:
+		// ANativeActivity_showSoftInput(native_activity,
+		// ANATIVEACTIVITY_SHOW_SOFT_INPUT_FORCED); did not work for some reason.
+
+		glob.java_functions.show_virtual_keyboard();
+	} else {
+		// NOTE:
+		// ANativeActivity_hideSoftInput(native_activity,
+		// ANATIVEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS); did not work for some reason
+
+		glob.java_functions.hide_virtual_keyboard();
+	}
+}

src/ruisapp/glue/android/window.hxx

@@ -53,5 +53,7 @@ public:
 	r4::vector2<unsigned> get_dims();
 
 	void set_fullscreen_internal(bool enable) override;
+
+	void set_virtual_keyboard_visible(bool visible) noexcept override;
 };
 } // namespace

src/ruisapp/glue/ios/glue.mm

@@ -364,14 +364,6 @@ - (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
 	// do nothing, ios swaps frame buffers automatically
 }
 
-void application::show_virtual_keyboard()noexcept{
-	//TODO:
-}
-
-void application::hide_virtual_keyboard()noexcept{
-	//TODO:
-}
-
 std::unique_ptr<papki::file> application::get_res_file(std::string_view path)const{
 	std::string dir([[[NSBundle mainBundle] resourcePath] fileSystemRepresentation]);
 

src/ruisapp/glue/sdl/application.cxx

@@ -276,15 +276,3 @@ void ruisapp::application::destroy_window(ruisapp::window& w)
 	glue.destroy_window(app_win.ruis_native_window.get().get_id());
 #endif
 }
-
-#if CFG_OS_NAME == CFG_OS_NAME_EMSCRIPTEN
-void ruisapp::application::show_virtual_keyboard() noexcept
-{
-	SDL_StartTextInput();
-}
-
-void ruisapp::application::hide_virtual_keyboard() noexcept
-{
-	SDL_StopTextInput();
-}
-#endif

src/ruisapp/glue/sdl/window.cxx

@@ -317,3 +317,12 @@ void native_window::set_mouse_cursor(ruis::mouse_cursor c)
 {
 	this->display.get().set_cursor(c);
 }
+
+void native_window::set_virtual_keyboard_visible(bool visible) noexcept
+{
+	if (visible) {
+		SDL_StartTextInput();
+	} else {
+		SDL_StopTextInput();
+	}
+}

src/ruisapp/glue/sdl/window.hxx

@@ -178,5 +178,7 @@ public:
 			));
 		}
 	}
+
+	void set_virtual_keyboard_visible(bool visible) noexcept override;
 };
 } // namespace