Windows smh

CMakeLists.txt

@@ -40,11 +40,11 @@ include_directories(${jlog_SOURCE_DIR}/include)
 file(GLOB_RECURSE HEADERS "include/*.h" "include/*.hpp")
 
 if(UNIX AND NOT APPLE)
-    file(GLOB_RECURSE SOURCES "src/rewindow/*.cpp" "src/platform/linux/*.cpp" "src/platform/shared/*.cpp")
+    file(GLOB_RECURSE SOURCES "src/types/*.cpp" "src/platform/linux/*.cpp" "src/platform/shared/*.cpp")
 endif()
 
 if(WIN32)
-    file(GLOB_RECURSE SOURCES "src/rewindow/*.cpp" "src/platform/windows/*.cpp" "src/platform/shared/*.cpp")
+    file(GLOB_RECURSE SOURCES "src/types/*.cpp" "src/platform/windows/*.cpp" "src/platform/shared/*.cpp")
 endif()
 
 include_directories("include")
@@ -71,8 +71,8 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(WIN32)
+    target_compile_options(ReWindowLibrary PUBLIC /utf-8)
     target_link_libraries(ReWindowLibrary PUBLIC J3ML Event jlog ${OPENGL_LIBRARIES})
-
     add_executable(ReWindowLibraryDemo main.cpp)
     target_link_libraries(ReWindowLibraryDemo PUBLIC ReWindowLibrary)
 endif()

include/rewindow/types/key.h

@@ -116,11 +116,10 @@ namespace Keys {
     static const Key LShift {"\\", X11Scancode::LEFT_SHIFT, WindowsScancode::LEFT_SHIFT};
     static const Key RShift {"\\", X11Scancode::RIGHT_SHIFT, WindowsScancode::RIGHT_SHIFT};
 
-    // TODO: Get the right character codes for these
-    static const Key UpArrow { "\u2191", X11Scancode::UP, WindowsScancode::UP_ARROW};
-    static const Key DownArrow {"\u2193", X11Scancode::DOWN, WindowsScancode::DOWN_ARROW};
-    static const Key LeftArrow {"\u2190", X11Scancode::LEFT, WindowsScancode::LEFT_ARROW};
-    static const Key RightArrow {"\u2192", X11Scancode::RIGHT, WindowsScancode::RIGHT_ARROW};
+    static const Key UpArrow {reinterpret_cast<const char*>(u8"↑"), X11Scancode::UP, WindowsScancode::UP_ARROW};
+    static const Key DownArrow {reinterpret_cast<const char*>(u8"↓"), X11Scancode::DOWN, WindowsScancode::DOWN_ARROW};
+    static const Key LeftArrow {reinterpret_cast<const char*>(u8"←"), X11Scancode::LEFT, WindowsScancode::LEFT_ARROW};
+    static const Key RightArrow {reinterpret_cast<const char*>(u8"→"), X11Scancode::RIGHT, WindowsScancode::RIGHT_ARROW};
 
     static const Key Super {"\000a", X11Scancode::SUPER, WindowsScancode::Nothing};
     static const Key Backspace {"\b", X11Scancode::BACKSPACE, WindowsScancode::BACKSPACE};

include/rewindow/types/window.h

@@ -2,7 +2,6 @@
 #include <cstdint>
 #include <vector>
 #include <Event.h>
-#include <functional>
 #include <map>
 #include <thread>
 #include <rewindow/types/key.h>

src/platform/windows/window.cpp

@@ -139,7 +139,6 @@ void RWindow::Open() {
     wc.hInstance = hInstance;
     wc.lpszClassName = "RWindowClass";
     RegisterClass(&wc);
-
     hwnd = CreateWindowEx(
         0,
         "RWindowClass",