PagesControl, refactor

src/window/Events.h

@@ -2,6 +2,7 @@
 #define WINDOW_EVENTS_H_
 
 #include "Window.h"
+#include "input.h"
 
 #include <string>
 #include <vector>
@@ -9,26 +10,6 @@
 
 typedef unsigned int uint;
 
-enum class inputtype {
-    keyboard,
-    button,
-};
-
-struct Binding {
-    inputtype type;
-    int code;
-    bool state = false;
-    bool justChange = false;
-
-    bool active() const {
-        return state; 
-    }
-
-    bool jactive() const {
-        return state && justChange;
-    }
-};
-
 class Events {
 public:
 	static bool* _keys;

src/window/input.cpp

@@ -66,6 +66,36 @@ int keycode::NUM_7 = GLFW_KEY_7;
 int keycode::NUM_8 = GLFW_KEY_8;
 int keycode::NUM_9 = GLFW_KEY_9;
 
+const char* keycode::name(int code) {
+    const char* name = glfwGetKeyName(code, glfwGetKeyScancode(code));
+    if (name == nullptr) {
+        switch (code) {
+            case GLFW_KEY_TAB: return "Tab";
+            case GLFW_KEY_LEFT_CONTROL: return "Left Ctrl";
+            case GLFW_KEY_RIGHT_CONTROL: return "Right Ctrl";
+            case GLFW_KEY_LEFT_ALT: return "Left Alt";
+            case GLFW_KEY_RIGHT_ALT: return "Right Alt";
+            case GLFW_KEY_LEFT_SHIFT: return "Left Shift";
+            case GLFW_KEY_RIGHT_SHIFT: return "Right Shift";
+            case GLFW_KEY_CAPS_LOCK: return "Caps-Lock";
+            case GLFW_KEY_SPACE: return "Space";
+            case GLFW_KEY_ESCAPE: return "Esc";
+            default:
+                return "Unknown";
+        }
+    }
+    return name;
+}
+
 int mousecode::BUTTON_1 = GLFW_MOUSE_BUTTON_1;
 int mousecode::BUTTON_2 = GLFW_MOUSE_BUTTON_2;
 int mousecode::BUTTON_3 = GLFW_MOUSE_BUTTON_3;
+
+const char* mousecode::name(int code) {
+    switch (code) {
+        case GLFW_MOUSE_BUTTON_1: return "LMB";
+        case GLFW_MOUSE_BUTTON_2: return "RMB";
+        case GLFW_MOUSE_BUTTON_3: return "MMB";
+    }
+    return "unknown button";
+}

src/window/input.h

@@ -66,12 +66,45 @@ namespace keycode {
     extern int NUM_7;
     extern int NUM_8;
     extern int NUM_9;
+
+    extern const char* name(int code);
 }
 
 namespace mousecode {
     extern int BUTTON_1;
     extern int BUTTON_2;
     extern int BUTTON_3;
+
+    extern const char* name(int code);
 }
 
+enum class inputtype {
+    keyboard,
+    button,
+};
+
+struct Binding {
+    inputtype type;
+    int code;
+    bool state = false;
+    bool justChange = false;
+
+    bool active() const {
+        return state; 
+    }
+
+    bool jactive() const {
+        return state && justChange;
+    }
+
+    const char* text() const {
+        switch (type) {
+            case inputtype::keyboard: return keycode::name(code);
+            case inputtype::button: return mousecode::name(code);
+        }
+        return "<unknown input type>";
+    }
+};
+
+
 #endif // WINDOW_INPUT_H_