[input] load key from config

Closes DadSchoorse#78

config/vkBasalt.conf

@@ -13,6 +13,8 @@ effects = cas
 #reshadeIncludePath = *path/to/reshade-shaders/Shaders*
 #depthCapture = off
 
+#toggleKey toggles the effects on/off
+toggleKey = Home
 
 #casSharpness specifies the amount of sharpning in the CAS shader.
 #0.0 less sharp, less artefacts, but not off

src/basalt.cpp

@@ -559,10 +559,12 @@ namespace vkBasalt
     {
         scoped_lock l(globalLock);
 
+        static uint32_t keySymbol = convertToKeySym(pConfig->getOption<std::string>("toggleKey", "Home"));
+
         static bool pressed       = false;
         static bool presentEffect = true;
 
-        if (isKeyPressed(XK_Home))
+        if (isKeyPressed(keySymbol))
         {
             if (!pressed)
             {

src/keyboard_input.cpp

@@ -1,49 +1,31 @@
-#include "logger.hpp"
-
 #include "keyboard_input.hpp"
 
-#include <memory>
-#include <functional>
+#include "logger.hpp"
+
+// TODO build without X11
+#ifndef VKBASALT_X11
+#define VKBASALT_X11 1
+#endif
 
-#include <unistd.h>
-#include <cstring>
+#if VKBASALT_X11
+#include "keyboard_input_x11.hpp"
+#endif
 
 namespace vkBasalt
 {
-    bool isKeyPressed(KeySym ks)
+    uint32_t convertToKeySym(std::string key)
     {
-        static int usesX11 = -1;
-
-        static std::unique_ptr<Display, std::function<void(Display*)>> display;
-
-        if (usesX11 < 0)
-        {
-            const char* disVar = getenv("DISPLAY");
-            if (!disVar || !std::strcmp(disVar, ""))
-            {
-                usesX11 = 0;
-                Logger::debug("no X11 support");
-            }
-            else
-            {
-                display = std::unique_ptr<Display, std::function<void(Display*)>>(XOpenDisplay(disVar), [](Display* d) { XCloseDisplay(d); });
-                usesX11 = 1;
-                Logger::debug("X11 support");
-            }
-        }
-
-        if (!usesX11)
-        {
-            return false;
-        }
-
-        char keys_return[32];
-
-        XQueryKeymap(display.get(), keys_return);
-
-        KeyCode kc2 = XKeysymToKeycode(display.get(), ks);
-
-        return !!(keys_return[kc2 >> 3] & (1 << (kc2 & 7)));
+#if VKBASALT_X11
+        return convertToKeySymX11(key);
+#endif
+        return 0u;
     }
 
+    bool isKeyPressed(uint32_t ks)
+    {
+#if VKBASALT_X11
+        return isKeyPressedX11(ks);
+#endif
+        return false;
+    }
 } // namespace vkBasalt

src/keyboard_input.hpp

@@ -1,12 +1,10 @@
-#ifndef KEYBOARD_INPUT_HPP_INCLUDED
-#define KEYBOARD_INPUT_HPP_INCLUDED
+#pragma once
 
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
+#include <cstdint>
+#include <string>
 
 namespace vkBasalt
 {
-    bool isKeyPressed(KeySym ks);
-}
-
-#endif // KEYBOARD_INPUT_HPP_INCLUDED
+    uint32_t convertToKeySym(std::string key);
+    bool     isKeyPressed(uint32_t ks);
+} // namespace vkBasalt

src/keyboard_input_x11.cpp

@@ -0,0 +1,63 @@
+#include "keyboard_input_x11.hpp"
+
+#include "logger.hpp"
+
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+
+#include <memory>
+#include <functional>
+
+#include <unistd.h>
+#include <cstring>
+
+namespace vkBasalt
+{
+    uint32_t convertToKeySymX11(std::string key)
+    {
+        // TODO what if X11 isn't loaded?
+        uint32_t result = (uint32_t) XStringToKeysym(key.c_str());
+        if (!result)
+        {
+            Logger::err("invalid key");
+        }
+        return result;
+    }
+
+    bool isKeyPressedX11(uint32_t ks)
+    {
+        static int usesX11 = -1;
+
+        static std::unique_ptr<Display, std::function<void(Display*)>> display;
+
+        if (usesX11 < 0)
+        {
+            const char* disVar = getenv("DISPLAY");
+            if (!disVar || !std::strcmp(disVar, ""))
+            {
+                usesX11 = 0;
+                Logger::debug("no X11 support");
+            }
+            else
+            {
+                display = std::unique_ptr<Display, std::function<void(Display*)>>(XOpenDisplay(disVar), [](Display* d) { XCloseDisplay(d); });
+                usesX11 = 1;
+                Logger::debug("X11 support");
+            }
+        }
+
+        if (!usesX11)
+        {
+            return false;
+        }
+
+        char keys_return[32];
+
+        XQueryKeymap(display.get(), keys_return);
+
+        KeyCode kc2 = XKeysymToKeycode(display.get(), (KeySym) ks);
+
+        return !!(keys_return[kc2 >> 3] & (1 << (kc2 & 7)));
+    }
+
+} // namespace vkBasalt

src/keyboard_input_x11.hpp

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace vkBasalt
+{
+    uint32_t convertToKeySymX11(std::string key);
+    bool     isKeyPressedX11(uint32_t ks);
+} // namespace vkBasalt

src/meson.build

@@ -23,6 +23,7 @@ vkBasalt_src = [
     'image.cpp',
     'image_view.cpp',
     'keyboard_input.cpp',
+    'keyboard_input_x11.cpp',
     'logger.cpp',
     'logical_swapchain.cpp',
     'lut_cube.cpp',