add FunKey menu

Signed-off-by: Michel-FK <[email protected]>

Author: Michel-FK

CMakeLists.txt

@@ -62,6 +62,7 @@ set(DinguxCommander_SRCS
   fileutils.cpp
   keyboard.cpp
   main.cpp
+  menu.cpp
   panel.cpp
   resourceManager.cpp
   screen.cpp

commander.cpp

@@ -16,6 +16,7 @@
 #include "screen.h"
 #include "sdlutils.h"
 #include "text_viewer.h"
+#include "menu.h"
 
 #define SPLITTER_LINE_W static_cast<int>(1 * screen.ppu_x)
 #define X_LEFT static_cast<int>(1 * screen.ppu_x)
@@ -103,6 +104,13 @@ const bool CCommander::keyPress(const SDL_Event &p_event)
     CWindow::keyPress(p_event);
     const auto sym = p_event.key.keysym.sym;
     const auto &c = config();
+    if (sym == c.key_menu) {
+        if (FK_RunMenu(screen.surface) == MENU_RETURN_EXIT) {
+	    // Quit
+            m_retVal = -1;
+	}
+	return true;
+    }
     if (sym == c.key_system) {
         if (openSystemMenu()) m_panelSource->refresh();
         return true;

config.cpp

@@ -93,6 +93,7 @@ SDLC_Keycode parseKeycode(const std::string &value)
     // We support a few common SDLK codes as config values.
     // We then allow single-char keys and ints for the rest.
     static const std::unordered_map<std::string, SDLC_Keycode> kSdlkToInt {
+        { "SDLK_MENU", SDLK_MENU },
         { "SDLK_BACKSPACE", SDLK_BACKSPACE },
         { "SDLK_DOWN", SDLK_DOWN },
         { "SDLK_ESCAPE", SDLK_ESCAPE },
@@ -179,6 +180,7 @@ void Config::Load(const std::string &path)
 
     CFG_BOOL(osk_key_system_is_backspace)
 
+    CFG_SDLK(key_menu)
     CFG_SDLK(key_down)
     CFG_SDLK(key_left)
     CFG_SDLK(key_open)

config.h

@@ -31,6 +31,7 @@ struct Config {
     std::string res_dir { RES_DIR };
 
     // Keyboard key code mappings
+    SDLC_Keycode key_menu = MYKEY_MENU;
     SDLC_Keycode key_down = MYKEY_DOWN;
     SDLC_Keycode key_left = MYKEY_LEFT;
     SDLC_Keycode key_open = MYKEY_OPEN;

config_def.h

@@ -46,6 +46,9 @@
 #define FILE_SYSTEM "/dev/sda4"
 #endif
 
+#ifndef MYKEY_MENU
+#define MYKEY_MENU SDLK_MENU
+#endif
 #ifndef MYKEY_UP
 #define MYKEY_UP SDLK_UP
 #endif

main.cpp

@@ -13,6 +13,7 @@
 #include "resourceManager.h"
 #include "screen.h"
 #include "sdlutils.h"
+#include "menu.h"
 
 // Globals
 const SDL_Color Globals::g_colorTextNormal = {COLOR_TEXT_NORMAL};
@@ -117,6 +118,9 @@ int main(int argc, char *argv[])
     SDL_EnableUNICODE(1);
 #endif
 
+    // Init menu
+    Menu::init();
+
     // Create instances
     CResourceManager::instance();