[app-main] Improved vkb visible handling

Author: DC-SWAT

applications/main/modules/module.c

@@ -398,52 +398,48 @@ void MainApp_Init(App_t *app) {
 static void Slide_EventHandler(void *ds_event, void *param, int action) {
 
 	SDL_Event *event = (SDL_Event *) param;
-	
-	if (GetModuleByName("vkb")) {
-		uintptr_t vkb = GET_EXPORT_ADDR("VirtKeyboardIsVisible");
-		if (((int (*)(void))vkb)()) {
-			return;
-		}
-	}
 
 	switch(event->type) {
-		
+
 		case SDL_JOYBUTTONDOWN:
 			switch(event->jbutton.button) {
 				case SDL_DC_L:
+					if (IsVirtKeyboardVisible()) {
+						break;
+					}
 					MainApp_SlideLeft(NULL);
 					break;
 
 				case SDL_DC_R:
+					if (IsVirtKeyboardVisible()) {
+						break;
+					}
 					MainApp_SlideRight(NULL);
 					break;
-				
+
 				default:
 					break;
 			}
 			break;
-		
+
 		case SDL_KEYDOWN:
-			switch (event->key.keysym.sym)
-			{
+			switch (event->key.keysym.sym) {
 				case SDLK_COMMA:
 					MainApp_SlideLeft(NULL);
 					break;
-				
+
 				case SDLK_PERIOD:
 					MainApp_SlideRight(NULL);
 					break;
-				
+
 				default:
 					break;
 			}
-			
 			break;
-		
+
 		default:
 			break;
 	}
-
 }
 
 void MainApp_Shutdown(App_t *app) {

include/gui.h

@@ -1,7 +1,7 @@
 /** 
  * \file    gui.h
  * \brief   DreamShell GUI
- * \date    2006-2023
+ * \date    2006-2025
  * \author  SWAT www.dc-swat.ru
  */
 
@@ -12,9 +12,9 @@
 #include "video.h"
 #include "list.h"
 #include "events.h"
+#include "module.h"
 #include "SDL/SDL_gui.h"
 
-
 /* Virtual keyboard from vkb module */
 int VirtKeyboardInit();
 void VirtKeyboardShutdown();
@@ -24,6 +24,15 @@ void VirtKeyboardShow();
 void VirtKeyboardHide();
 void VirtKeyboardToggle();
 
+static inline int IsVirtKeyboardVisible() {
+    if (GetModuleByName("vkb")) {
+        uintptr_t vkb = GET_EXPORT_ADDR("VirtKeyboardIsVisible");
+        if (vkb) {
+            return ((int (*)(void))vkb)();
+        }
+    }
+    return 0;
+}
 
 /* Main GUI */
 int InitGUI();
@@ -35,7 +44,6 @@ void GUI_Enable();
 int GUI_Object2Trash(GUI_Object *object);
 void GUI_ClearTrash();
 
-
 /* GUI utils */
 Uint32 colorHexToRGB(char *color, SDL_Color *clr);
 SDL_Color Uint32ToColor(Uint32 c);