Overlooked a stupid in refresh_rate calculation.

Only ask X11 where the cursor is once per frame.

.gitea/workflows/buildtest.yml

@@ -0,0 +1,23 @@
+name: Run ReCI Build Test
+run-name: Run ReCI Build Test For ${{ gitea.repository }}.
+on: [push]
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-22.04
+    env:
+      RECI_GIT: https://git.redacted.cc/maxine/ReCI
+      RECI: /RECI
+    steps:
+      - run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event."
+      - run: echo "This job is now running on a ${{ runner.os }} server hosted by Gitea!"
+      - run: echo "The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - run: echo "The ${{ gitea.repository }} repository has been cloned to the runner."
+      - run: echo "The workflow is now ready to run your tests on the runner."
+      - run: echo "Install toolchain and run ReCI build test"
+      - run: apt-get update && apt-get install -y lua5.3 git && git clone $RECI_GIT $RECI
+      - run: lua $RECI/reci.lua -f $RECI/scripts/buildtools.reci -f reci/scripts/builddeps.reci -f $RECI/scripts/buildtest.reci
+      - run: echo this exists so I can run the reci test
+      - run: echo "This job's status is ${{ job.status }}."

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.18..3.27)
 project(ReWindowLibrary
     VERSION 1.0
     LANGUAGES CXX
@@ -14,21 +14,21 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 
 # Enable Package Managers
- include(cmake/CPM.cmake)
+include(cmake/CPM.cmake)
 
 CPMAddPackage(
     NAME J3ML
-    URL https://git.redacted.cc/josh/j3ml/archive/Release-2.1.zip
+    URL https://git.redacted.cc/josh/j3ml/archive/Release-3.1.zip
 )
 
 CPMAddPackage(
     NAME Event
-    URL https://git.redacted.cc/josh/Event/archive/Release-6.zip
+    URL https://git.redacted.cc/josh/Event/archive/Release-12.zip
 )
 
 CPMAddPackage(
         NAME jlog
-        URL https://git.redacted.cc/josh/jlog/archive/Prerelease-7.zip
+        URL https://git.redacted.cc/josh/jlog/archive/Prerelease-16.zip
 )
 
 find_package(OpenGL REQUIRED)
@@ -39,12 +39,15 @@ include_directories(${jlog_SOURCE_DIR}/include)
 
 file(GLOB_RECURSE HEADERS "include/*.h" "include/*.hpp")
 
+file(GLOB_RECURSE HEADERS "include/logger/*.h" "include/logger/*.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" "src/logger/*.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" "src/logger/*.cpp")
 endif()
 
 include_directories("include")
@@ -63,7 +66,7 @@ target_include_directories(ReWindowLibrary PUBLIC ${Event_SOURCE_DIR}/include)
 set_target_properties(ReWindowLibrary PROPERTIES LINKER_LANGUAGE CXX)
 
 if(UNIX AND NOT APPLE)
-    target_link_libraries(ReWindowLibrary PUBLIC X11 J3ML Event jlog ${OPENGL_LIBRARIES})
+    target_link_libraries(ReWindowLibrary PUBLIC X11 Xrandr J3ML Event jlog ${OPENGL_LIBRARIES})
     target_link_libraries(ReWindowLibrary PUBLIC)
 
     add_executable(ReWindowLibraryDemo main.cpp)
@@ -71,8 +74,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()
+endif()

README.md

@@ -11,7 +11,8 @@ A library which allows easily creating and managing a window  and it's events ac
 Install dependencies
 
 ```bash
-  dnf install cmake make gcc-g++ libX11 libX11-devel
+Fedora/RHEL:  dnf install cmake make gcc-g++ libX11 libX11-devel mesa-libGL-devel
+Ubuntu/Debian:  apt-get install cmake make gcc g++ libx11-6 libx11-dev libgl-dev libxrandr-dev
 ```
 
 Clone the repository
@@ -30,4 +31,4 @@ Run it
 
 ```bash
   ./ReWindowDemo
-```
+```

include/rewindow/data/WindowsScancodes.h

@@ -1,7 +1,7 @@
 #pragma once
 
 enum class WindowsScancode {
- Nothing = 0,
+    Nothing = 0,
     ESCAPE = 0x1B,           // VK_ESCAPE
     ONE = 0x31,              // '1'
     TWO = 0x32,              // '2'
@@ -43,7 +43,7 @@ enum class WindowsScancode {
     SEMICOLON = 0xBA,        // VK_OEM_1
     SINGLEQUOTE = 0xDE,      // VK_OEM_7
     GRAVE = 0xC0,            // VK_OEM_3
-    LEFT_SHIFT = 0xA0,       // VK_LSHIFT
+    LEFT_SHIFT = 0x10,       // VK_LSHIFT
     BACKSLASH = 0xDC,        // VK_OEM_5
     Z = 0x5A,                // 'Z'
     X = 0x58,                // 'X'
@@ -52,7 +52,6 @@ enum class WindowsScancode {
     B = 0x42,                // 'B'
     N = 0x4E,                // 'N'
     M = 0x4D,                // 'M'
-    COMMA = 0xBC,            // VK_OEM_COMMA
     PERIOD = 0xBE,           // VK_OEM_PERIOD
     SLASH = 0xBF,            // VK_OEM_2
     RIGHT_SHIFT = 0xA1,      // VK_RSHIFT
@@ -97,6 +96,12 @@ enum class WindowsScancode {
     NUMPAD_NINE = 0x69,      // VK_NUMPAD9
     NUMPAD_PLUS = 0x6B,      // VK_ADD
     NUMPAD_MINUS = 0x6D,     // VK_SUBTRACT
-    NUMPAD_DECIMAL = 0x6E,   // VK_DECIMAL
-    NUMPAD_ENTER = 0x0D      // VK_RETURN
+    NUMPAD_ASTERISK = 0x6A,
+    NUMPAD_SLASH = 0x6F,
+    NUMPAD_PERIOD = 0x6E,   // VK_DECIMAL
+    NUMPAD_ENTER = 0x0D,      // VK_RETURN
+    SUPER = 0x5B,
+    COMMA = 0xBC,
+    MENU = 93,
+    BREAK = 0x13
 };

include/rewindow/data/X11Scancodes.h

@@ -24,6 +24,7 @@ enum class X11Scancode {
     PAGEUP = 112,
     PAGEDOWN = 117,
     HOME = 110,
+    MENU = 135,
     END = 115,
     INSERT = 118,
     DEL = 119,

include/rewindow/logger/logger.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "jlog/Logger.hpp"
+
+namespace ReWindow::Logger {
+    using namespace jlog;
+
+    extern GenericLogger Fatal;
+    extern GenericLogger Debug;
+}

include/rewindow/types/display.h

@@ -0,0 +1,39 @@
+#pragma once
+#include <vector>
+#include <J3ML/J3ML.hpp>
+
+namespace ReWindow {
+    class FullscreenGraphicsMode;
+    class Display;
+}
+
+///A given graphics mode that a display supports.
+///Upon startup, We'll poll the display server for this.
+class ReWindow::FullscreenGraphicsMode {
+private:
+    u32 width;
+    u32 height;
+    short refresh_rate;
+public:
+    FullscreenGraphicsMode() = default;
+    FullscreenGraphicsMode(u32 width, u32 height, short refresh_rate);
+    [[nodiscard]] u32 getWidth() const;
+    [[nodiscard]] u32 getHeight() const;
+    [[nodiscard]] float getRefreshRate() const;
+};
+
+///Refers to a particular monitor the user has.
+class ReWindow::Display {
+private:
+    ///* The graphics mode of the display when our program was started. The primary use for this
+    ///* is so that if the user has selected a different mode in-game we can restore the old mode upon exit. *///
+    FullscreenGraphicsMode default_graphics_mode{};
+    ///All graphics modes that a given display supports.
+    std::vector<FullscreenGraphicsMode> graphics_modes;
+public:
+    Display() = default;
+    Display(const FullscreenGraphicsMode& default_graphics_mode, const std::vector<FullscreenGraphicsMode>& graphics_modes);
+    FullscreenGraphicsMode getDefaultGraphicsMode();
+    std::vector<FullscreenGraphicsMode> getGraphicsModes();
+    static std::vector<Display> getDisplaysFromWindowManager();
+};

include/rewindow/types/gamepad.h

@@ -0,0 +1,26 @@
+/// ReWindowLibrary
+/// A C++20 Library for creating and managing windows in a platform-independent manner
+/// Developed and Maintained by the boys @ Redacted Software.
+/// (c) 2024 Redacted Software
+/// This work is dedicated to the public domain.
+
+/// @file gamepad.h
+/// @desc A class that models the functionality of a gamepad / controller device.
+/// @edit 2024-07-29
+
+#pragma once
+
+namespace ReWindow
+{
+
+    class InputDevice {}; // TODO: Remember to break InputDevice into it's own file and not define it twice!!!
+
+    class Gamepad : public InputDevice
+    {
+
+    };
+
+
+    class XboxGamepad : public Gamepad {};
+    class PS4Gamepad : public Gamepad {};
+}

include/rewindow/types/gamepadbutton.h

@@ -0,0 +1,75 @@
+/// ReWindowLibrary
+/// A C++20 Library for creating and managing windows in a platform-independent manner
+/// Developed and Maintained by the boys @ Redacted Software.
+/// (c) 2024 Redacted Software
+/// This work is dedicated to the public domain.
+
+/// @file gamepadbutton.h
+/// @desc GamepadButton class and enumerations to define standard buttons found on a Gamepad
+/// @edit 2024-07-29
+
+#include <string>
+#include <J3ML/LinearAlgebra.hpp>
+
+class GamepadButton {
+protected:
+    std::string mnemonic_btn_code;
+public:
+    explicit GamepadButton(const std::string& mnemonic) : mnemonic_btn_code(mnemonic) {  }
+    [[nodiscard]] std::string GetMnemonicButtonCode() const { return mnemonic_btn_code; }
+
+    /// Compares two GamepadButtons by their mnemonic button codes, not their activation state.
+    bool operator ==(const GamepadButton& rhs) const;
+};
+
+class GamepadTrigger {
+public:
+
+    /// Returns a float value between 0-1 representing how much the trigger has been pushed in by.
+    /// (0 being unpressed, 1 being fully pressed)
+    float GetActuation() const;
+
+    /// TODO: Might be more appropriate in the Gamepad class representation.
+    void SetActuationThreshold(float minimum = 0.01f) const;
+};
+
+class GamepadThumbstick
+{
+public:
+    /// Returns a Vector2 value representing the x,y coordinates of the joystick, with 0,0 being the center (at rest).
+    /// This vector ranges from length = 0 to length = 1 (i.e. the unit circle).
+    [[nodiscard]] Vector2 GetPosition() const;
+
+
+    /// Sets the deadzone range of the thumbstick.
+    /// Deadzone controls how far the stick must be moved before any movement is actually reported.
+    /// This is because the thumbstick at-rest will often still report movement.
+    /// If gamecode is architected to use the thumbstick position as a direction, without factoring in magnitude, this would cause problems.
+    void SetDeadzone(float minimum = 0.01f) const;
+};
+
+
+
+using J3ML::LinearAlgebra::Vector2;
+
+namespace GamepadButtons {
+    static const GamepadButton X {"X"};
+    static const GamepadButton Y {"Y"};
+    static const GamepadButton A {"A"};
+    static const GamepadButton B {"B"};
+
+    static const auto Triangle = Y;
+    static const auto Square   = X;
+    static const auto Circle   = A;
+    static const auto Cross    = B;
+
+
+    static const GamepadButton LeftBumper {"LB"};
+    static const GamepadButton RightBumper {"RB"};
+}
+
+namespace GamepadTriggers
+{
+    static const GamepadTrigger Left;
+    static const GamepadTrigger Right;
+}

include/rewindow/types/key.h

@@ -3,19 +3,13 @@
 #pragma once
 
 #include <vector>
-#include <J3ML/LinearAlgebra/Vector2.h>
-#include <jlog/jlog.hpp>
 #include <stdexcept>
 #include <iostream>
-#if __linux__
-#include <X11/X.h>
-#endif
-
 #include <string>
 #include <rewindow/data/X11Scancodes.h>
 #include <rewindow/data/WindowsScancodes.h>
+#include <J3ML/LinearAlgebra.hpp>
 
-using J3ML::LinearAlgebra::Vector2;
 
 class Key
 {
@@ -37,31 +31,44 @@ public:
 
 namespace Keys {
     // TODO: Encode both Uppercase and Lowercase version for each keymap
-    static const Key Escape {"\b", X11Scancode::ESCAPE, WindowsScancode::ESCAPE};
-    static const Key F1  {"\u000f", X11Scancode::F1, WindowsScancode::F1};
-    static const Key F2  {"\u000f", X11Scancode::F2, WindowsScancode::F2};
-    static const Key F3  {"\u000f", X11Scancode::F3, WindowsScancode::F3};
-    static const Key F4  {"\u000f", X11Scancode::F4, WindowsScancode::F4};
-    static const Key F5  {"\u000f", X11Scancode::F5, WindowsScancode::F5};
-    static const Key F6  {"\u000f", X11Scancode::F6, WindowsScancode::F6};
-    static const Key F7  {"\u000f", X11Scancode::F7, WindowsScancode::F7};
-    static const Key F8  {"\u000f", X11Scancode::F8, WindowsScancode::F8};
-    static const Key F9  {"\u000f", X11Scancode::F9, WindowsScancode::F9};
-    static const Key F10 {"\u000f", X11Scancode::F10, WindowsScancode::F10};
-    static const Key F11 {"\u000f", X11Scancode::F11, WindowsScancode::F11};
-    static const Key F12 {"\u000f", X11Scancode::F12, WindowsScancode::F12};
+    static const Key Escape {"ESC", X11Scancode::ESCAPE, WindowsScancode::ESCAPE};
+    static const Key F1  {"F1", X11Scancode::F1, WindowsScancode::F1};
+    static const Key F2  {"F2", X11Scancode::F2, WindowsScancode::F2};
+    static const Key F3  {"F3", X11Scancode::F3, WindowsScancode::F3};
+    static const Key F4  {"F4", X11Scancode::F4, WindowsScancode::F4};
+    static const Key F5  {"F5", X11Scancode::F5, WindowsScancode::F5};
+    static const Key F6  {"F6", X11Scancode::F6, WindowsScancode::F6};
+    static const Key F7  {"F7", X11Scancode::F7, WindowsScancode::F7};
+    static const Key F8  {"F8", X11Scancode::F8, WindowsScancode::F8};
+    static const Key F9  {"F9", X11Scancode::F9, WindowsScancode::F9};
+    static const Key F10 {"F10", X11Scancode::F10, WindowsScancode::F10};
+    static const Key F11 {"F11", X11Scancode::F11, WindowsScancode::F11};
+    static const Key F12 {"F12", X11Scancode::F12, WindowsScancode::F12};
+    static const Key Print {"PRINT", X11Scancode::PRINT, WindowsScancode::PRINTSCREEN};
+    static const Key ScrollLock {"SCROLL_LOCK", X11Scancode::SCROLL_LOCK, WindowsScancode::SCROLL_LOCK};
+    static const Key Break {"BREAK", X11Scancode::BREAK, WindowsScancode::BREAK};
 
-    static const Key NumPad1 {"\b", X11Scancode::KP_1, WindowsScancode::NUMPAD_ONE};
-    static const Key NumPad2 {"\b", X11Scancode::KP_2, WindowsScancode::NUMPAD_TWO};
-    static const Key NumPad3 {"\b", X11Scancode::KP_3, WindowsScancode::NUMPAD_THREE};
-    static const Key NumPad4 {"\b", X11Scancode::KP_4, WindowsScancode::NUMPAD_FOUR};
-    static const Key NumPad5 {"\b", X11Scancode::KP_5, WindowsScancode::NUMPAD_FIVE};
-    static const Key NumPad6 {"\b", X11Scancode::KP_6, WindowsScancode::NUMPAD_SIX};
-    static const Key NumPad7 {"\b", X11Scancode::KP_7, WindowsScancode::NUMPAD_SEVEN};
-    static const Key NumPad8 {"\b", X11Scancode::KP_8, WindowsScancode::NUMPAD_EIGHT};
-    static const Key NumPad9 {"\b", X11Scancode::KP_9, WindowsScancode::NUMPAD_NINE};
-    static const Key NumPad0 {"\b", X11Scancode::KP_0, WindowsScancode::NUMPAD_ZERO};
+    //TODO On Windows, Return & KP_RETURN are the same thing.
+    static const Key NumPadReturn {"KP_↵", X11Scancode::KP_RETURN, WindowsScancode::NUMPAD_ENTER};
+    static const Key NumPadPlus {"KP_+", X11Scancode::KP_PLUS, WindowsScancode::NUMPAD_PLUS};
+    static const Key NumPadMinus {"KP_-", X11Scancode::KP_MINUS, WindowsScancode::NUMPAD_MINUS};
+    static const Key NumPadAsterisk {"KP_*", X11Scancode::KP_ASTERISK, WindowsScancode::NUMPAD_ASTERISK};
+    static const Key NumPadForwardSlash {"KP_/", X11Scancode::KP_SLASH, WindowsScancode::NUMPAD_SLASH};
+    static const Key NumPadPeriod {"KP_.", X11Scancode::KP_PERIOD, WindowsScancode::NUMPAD_PERIOD};
+    static const Key NumPadNumLock {"KP_NUMLOCK", X11Scancode::KP_NUMLOCK, WindowsScancode::NUM_LOCK};
 
+    static const Key NumPad1 {"KP_1", X11Scancode::KP_1, WindowsScancode::NUMPAD_ONE};
+    static const Key NumPad2 {"KP_2", X11Scancode::KP_2, WindowsScancode::NUMPAD_TWO};
+    static const Key NumPad3 {"KP_3", X11Scancode::KP_3, WindowsScancode::NUMPAD_THREE};
+    static const Key NumPad4 {"KP_4", X11Scancode::KP_4, WindowsScancode::NUMPAD_FOUR};
+    static const Key NumPad5 {"KP_5", X11Scancode::KP_5, WindowsScancode::NUMPAD_FIVE};
+    static const Key NumPad6 {"KP_6", X11Scancode::KP_6, WindowsScancode::NUMPAD_SIX};
+    static const Key NumPad7 {"KP_7", X11Scancode::KP_7, WindowsScancode::NUMPAD_SEVEN};
+    static const Key NumPad8 {"kP_8", X11Scancode::KP_8, WindowsScancode::NUMPAD_EIGHT};
+    static const Key NumPad9 {"KP_9", X11Scancode::KP_9, WindowsScancode::NUMPAD_NINE};
+    static const Key NumPad0 {"KP_0", X11Scancode::KP_0, WindowsScancode::NUMPAD_ZERO};
+
+    static const Key Grave {"`", X11Scancode::GRAVE, WindowsScancode::GRAVE};
     static const Key One {"1", X11Scancode::ONE, WindowsScancode::ONE};
     static const Key Two {"2", X11Scancode::TWO, WindowsScancode::TWO};
     static const Key Three {"3", X11Scancode::THREE, WindowsScancode::THREE};
@@ -72,7 +79,11 @@ namespace Keys {
     static const Key Eight {"8", X11Scancode::EIGHT, WindowsScancode::EIGHT};
     static const Key Nine {"9", X11Scancode::NINE, WindowsScancode::NINE};
     static const Key Zero {"0", X11Scancode::ZERO, WindowsScancode::ZERO};
+    static const Key Minus {"-", X11Scancode::MINUS, WindowsScancode::MINUS};
+    static const Key Equals {"+", X11Scancode::EQUALS, WindowsScancode::EQUALS};
+    static const Key Backspace {"⌫", X11Scancode::BACKSPACE, WindowsScancode::BACKSPACE};
 
+    static const Key Tab {"⇥", X11Scancode::TAB, WindowsScancode::TAB};
     static const Key Q {"Q", X11Scancode::Q, WindowsScancode::Q};
     static const Key W {"W", X11Scancode::W, WindowsScancode::W};
     static const Key E {"E", X11Scancode::E, WindowsScancode::E};
@@ -83,6 +94,11 @@ namespace Keys {
     static const Key I {"I", X11Scancode::I, WindowsScancode::I};
     static const Key O {"O", X11Scancode::O, WindowsScancode::O};
     static const Key P {"P", X11Scancode::P, WindowsScancode::P};
+    static const Key LeftBracket {"[", X11Scancode::OPENING_SQUARE_BRACKET, WindowsScancode::LEFT_BRACKET};
+    static const Key RightBracket {"]", X11Scancode::CLOSING_SQUARE_BRACKET, WindowsScancode::RIGHT_BRACKET};
+    static const Key BackSlash {"\\", X11Scancode::BACKSLASH, WindowsScancode::BACKSLASH};
+
+    static const Key CapsLock = {"CAPS", X11Scancode::CAPSLOCK, WindowsScancode::CAPS_LOCK};
     static const Key A {"A", X11Scancode::A, WindowsScancode::A};
     static const Key S {"S", X11Scancode::S, WindowsScancode::S};
     static const Key D {"D", X11Scancode::D, WindowsScancode::D};
@@ -93,12 +109,10 @@ namespace Keys {
     static const Key K {"K", X11Scancode::K, WindowsScancode::K};
     static const Key L {"L", X11Scancode::L, WindowsScancode::L};
     static const Key Semicolon {";", X11Scancode::SEMICOLON, WindowsScancode::SEMICOLON};
-    static const Key SingeQuote {"\"", X11Scancode::SINGLEQUOTE, WindowsScancode::SINGLEQUOTE};
-    static const Key Enter {"\n", X11Scancode::RETURN, WindowsScancode::ENTER};
-    //static const Key KeyPadEnter {"\n", X11Scancode::KP_RETURN};
-    static const Key Minus {"-", X11Scancode::MINUS, WindowsScancode::MINUS};
-    //static const Key KeyPadMinus {"-", X11Scancode::KP_MINUS};
-    static const Key Equals {"=", X11Scancode::EQUALS, WindowsScancode::EQUALS};
+    static const Key SingeQuote {"\'", X11Scancode::SINGLEQUOTE, WindowsScancode::SINGLEQUOTE};
+    static const Key Return {"↵", X11Scancode::RETURN, WindowsScancode::ENTER};
+
+    static const Key LeftShift {"⇧", X11Scancode::LEFT_SHIFT, WindowsScancode::LEFT_SHIFT};
     static const Key Z {"Z", X11Scancode::Z, WindowsScancode::Z};
     static const Key X {"X", X11Scancode::X, WindowsScancode::X};
     static const Key C {"C", X11Scancode::C, WindowsScancode::C};
@@ -106,105 +120,36 @@ namespace Keys {
     static const Key B {"B", X11Scancode::B, WindowsScancode::B};
     static const Key N {"N", X11Scancode::N, WindowsScancode::N};
     static const Key M {"M", X11Scancode::M, WindowsScancode::M};
+    static const Key Comma = {",", X11Scancode::COMMA, WindowsScancode::COMMA};
     static const Key Period {".", X11Scancode::PERIOD, WindowsScancode::PERIOD};
     static const Key ForwardSlash {"/", X11Scancode::SLASH, WindowsScancode::SLASH};
-    static const Key BackSlash {"\\", X11Scancode::BACKSLASH, WindowsScancode::BACKSLASH};
 
+    static const Key LeftControl {"LCTRL", X11Scancode::LEFT_CTRL, WindowsScancode::CTRL};
+    static const Key Super {"❖", X11Scancode::SUPER, WindowsScancode::SUPER};
+    static const Key LeftAlt {"🄰", X11Scancode::LEFT_ALT, WindowsScancode::ALT};
     static const Key Space {" ", X11Scancode::SPACE, WindowsScancode::SPACE};
+    static const Key RightAlt {"R🄰", X11Scancode::RIGHT_ALT, WindowsScancode::ALT};
+    static const Key Menu = {"▤", X11Scancode::MENU, WindowsScancode::MENU};
+    static const Key RightControl {"RCTRL", X11Scancode::RIGHT_CONTROL, WindowsScancode::CTRL};
+    static const Key RightShift {"R⇧", X11Scancode::RIGHT_SHIFT, WindowsScancode::RIGHT_SHIFT};
 
-    static const Key LControl {"\\", X11Scancode::LEFT_CTRL, WindowsScancode::CTRL};
-    static const Key RControl {"\\", X11Scancode::RIGHT_CONTROL, WindowsScancode::CTRL};
+    static const Key Insert {"INSERT", X11Scancode::INSERT, WindowsScancode::INSERT};
+    static const Key Home {"HOME", X11Scancode::HOME, WindowsScancode::HOME};
+    static const Key PageUp {"PAGEUP", X11Scancode::PAGEUP, WindowsScancode::PAGE_UP};
+    static const Key Delete {"DELETE", X11Scancode::DEL, WindowsScancode::DEL};
+    static const Key End {"End", X11Scancode::END, WindowsScancode::END};
+    static const Key PageDown {"PAGEDOWN", X11Scancode::PAGEDOWN, WindowsScancode::PAGE_DOWN};
 
-    static const Key LAlt {"\\", X11Scancode::LEFT_ALT, WindowsScancode::ALT};
-    static const Key RAlt {"\\", X11Scancode::RIGHT_ALT, WindowsScancode::ALT};
+    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 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 Super {"\000a", X11Scancode::SUPER, WindowsScancode::Nothing};
-    static const Key Backspace {"\b", X11Scancode::BACKSPACE, WindowsScancode::BACKSPACE};
-
-    static const Key LeftBracket {"[", X11Scancode::OPENING_SQUARE_BRACKET, WindowsScancode::LEFT_BRACKET};
-    static const Key RightBracket {"]", X11Scancode::CLOSING_SQUARE_BRACKET, WindowsScancode::RIGHT_BRACKET};
 }
 
-class GamepadButton {};
-class MouseButton {
-public:
-    MouseButton();
-    explicit MouseButton(const char* charcode);
-    const char* CharCode;
-};
 
-using J3ML::LinearAlgebra::Vector2;
 
-class InputService {
-public:
-    static Vector2 GetLeftJoystick();
-    static Vector2 GetRightJoystick();
-};
 
-namespace GamepadButtons {
-    static const GamepadButton X;
-    static const GamepadButton Y;
-    static const GamepadButton A;
-    static const GamepadButton B;
-}
 
-namespace MouseButtons
-{
-    static const MouseButton Left {"l"};
-    static const MouseButton Right {"r"};
-    static const MouseButton Middle {"m"};
-    static const MouseButton MWheelUp {"1"};
-    static const MouseButton MWheelDown {"2"};
-    static const MouseButton Mouse4 {"4"};
-    static const MouseButton Mouse5 {"5"};
-    static const MouseButton Unimplemented {"u"};
-}
-
-#if __linux__
-static MouseButton GetMouseButtonFromXButton(unsigned int button) {
-    switch(button) {
-        case Button1: return MouseButtons::Left;
-        case Button2: return MouseButtons::Middle;
-        case Button3: return MouseButtons::Right;
-        case Button4: return MouseButtons::MWheelUp;
-        case Button5: return MouseButtons::MWheelDown;
-        //For *whatever* reason. These aren't in X.h
-        case 8: return MouseButtons::Mouse4;
-        case 9: return MouseButtons::Mouse5;
-        default: {
-            FATAL("Undefined XButtonCode: " + std::to_string((int) button))
-            return MouseButtons::Unimplemented;
-            break;
-        }
-    }
-}
-
-static Key GetKeyFromX11Scancode(X11Scancode code) {
-    for (auto& key : Key::GetKeyboard())
-        if (key.x11ScanCode == code)
-            return key;
-
-    std::cout << "Unavaliable Scancode: " + std::to_string((int)code) << std::endl;
-    return Keys::Space;
-}
-#endif
-
-#if _WIN32
-static Key GetKeyFromWindowsScancode(WindowsScancode code) {
-    for (const auto& key : Key::GetKeyboard())
-        if (key.winScanCode == code)
-            return key;
-
-    std::cout << "Unavaliable Scancode: " + std::to_string((int) code) << std::endl;
-    return Keys::Space;
-}
-#endif
+Key GetKeyFromX11Scancode(X11Scancode code);
+Key GetKeyFromWindowsScancode(WindowsScancode code);

include/rewindow/types/keyboard.h

@@ -0,0 +1,22 @@
+/// ReWindowLibrary
+/// A C++20 Library for creating and managing windows in a platform-independent manner
+/// Developed and Maintained by the boys @ Redacted Software.
+/// (c) 2024 Redacted Software
+/// This work is dedicated to the public domain.
+
+/// @file keyboard.h
+/// @desc A class that models the functionality of a keyboard device.
+/// @edit 2024-07-29
+
+#pragma once
+
+
+namespace ReWindow
+{
+    class InputDevice {};
+
+    class Keyboard : public InputDevice
+    {
+
+    };
+}

include/rewindow/types/mouse.h

@@ -0,0 +1,26 @@
+/// ReWindowLibrary
+/// A C++20 Library for creating and managing windows in a platform-independent manner
+/// Developed and Maintained by the boys @ Redacted Software.
+/// (c) 2024 Redacted Software
+/// This work is dedicated to the public domain.
+
+/// @file keyboard.h
+/// @desc A class that models the functionality of a mouse / pointer device.
+/// @edit 2024-07-29
+
+#pragma once
+
+
+namespace ReWindow
+{
+
+    class InputDevice {}; // TODO: Remember to break InputDevice into it's own file and not define it twice!!!
+
+    class Pointer : public InputDevice {};
+
+
+    class Mouse : public Pointer
+    {
+
+    };
+}

include/rewindow/types/mousebutton.h

@@ -0,0 +1,38 @@
+/// ReWindowLibrary
+/// A C++20 Library for creating and managing windows in a platform-independent manner
+/// Developed and Maintained by the boys @ Redacted Software.
+/// (c) 2024 Redacted Software
+/// This work is dedicated to the public domain.
+
+/// @file mousebutton.hpp
+/// @desc MouseButton class and defined MouseButtons.
+/// @edit 2024-07-29
+
+#pragma once
+
+
+class MouseButton {
+public:
+    MouseButton();
+    explicit MouseButton(const char* charcode, unsigned int index);
+    const char* CharCode;
+    unsigned int ButtonIndex;
+    bool operator == (const MouseButton& mb) const;
+};
+
+
+namespace MouseButtons
+{
+    static const MouseButton Left {"l", 1};
+    static const MouseButton Right {"r", 2};
+    static const MouseButton Middle {"m", 3};
+    static const MouseButton MWheelUp {"1", 4};
+    static const MouseButton MWheelDown {"2", 5};
+    static const MouseButton Mouse4 {"4", 8};
+    static const MouseButton Mouse5 {"5", 9};
+    static const MouseButton Unimplemented {"u", 0};
+}
+
+MouseButton GetMouseButtonFromXButton(unsigned int button);
+
+

include/rewindow/types/window.h

@@ -2,25 +2,14 @@
 #include <cstdint>
 #include <vector>
 #include <Event.h>
-#include <functional>
+#include <EventConnection.h> // TODO: Fix this shit to where we don't need to include both files they should just be bundled together
 #include <map>
 #include <thread>
 #include <rewindow/types/key.h>
-
-#if WIN32
-#include <windows.h>
-#include <windowsx.h>
-#include <wingdi.h>
-#endif
-
-#if __linux__
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <GL/gl.h>
-#include <GL/glx.h>
-#endif
-
 #include <rewindow/types/cursors.h>
+#include <rewindow/types/mousebutton.h>
+#include <rewindow/types/gamepadbutton.h>
+#include <J3ML/LinearAlgebra.hpp>
 
 using namespace std::chrono_literals;
 using precision_clock = std::chrono::high_resolution_clock;
@@ -35,6 +24,8 @@ enum class RWindowFlags: uint8_t {
 	MAX_FLAG
 };
 
+std::string RWindowFlagToStr(RWindowFlags flag);
+
 enum class RenderingAPI: uint8_t {
 	OPENGL = 0,
 	//Vulkan is unimplemented.
@@ -113,12 +104,16 @@ namespace ReWindow
 		class MouseButtonDownEvent : public MouseEvent {
 		public:
 			MouseButton Button;
+
+            MouseButtonDownEvent() = default;
 			MouseButtonDownEvent(MouseButton Button) : MouseEvent() {}
 		};
 
 		class MouseButtonUpEvent : public MouseEvent {
 		public:
 			MouseButton Button;
+            MouseButtonUpEvent() = default;
+			MouseButtonUpEvent(MouseButton Button) : MouseEvent() {}
 		};
 
 		class WindowResizeRequestEvent : public RWindowEvent
@@ -130,24 +125,40 @@ namespace ReWindow
 
 	using namespace WindowEvents;
 
+
+	/// General To Do List
+	/// TODO: Clean up public API to express the cross-platform, multi-graphics-mode ethos of this project.
+	///
+
 	class RWindow {
 	public:
 
+		/// We keep and support both mechanisms for extending behavior to suit:
+		/// 1. Derived windows with added functionality.
+		/// 2. Binding functions to a pre-existing window.
 #pragma region Callbacks
 		/// Bindable Non-intrusive event handlers
 		/// Use these when you can't override the base window class
+		Event<> OnOpenEvent;
+        Event<> OnClosingEvent;
 		Event<RWindowEvent> OnFocusLostEvent;
 		Event<RWindowEvent> OnFocusGainEvent;
 		Event<float> OnRefreshEvent;
 		Event<WindowResizeRequestEvent> OnResizeRequestEvent;
-		Event<KeyDownEvent> OnKeyDownEvent;
+        Event<KeyDownEvent> OnKeyDownEvent;
 		Event<KeyUpEvent> OnKeyUpEvent;
 		Event<MouseMoveEvent> OnMouseMoveEvent;
 		Event<MouseButtonDownEvent> OnMouseButtonDownEvent;
 		Event<MouseButtonUpEvent> OnMouseButtonUpEvent;
 #pragma endregion
-
 #pragma region Overrides
+		/// Intrusive virtual methods intended to be overridden in a derived class.
+		/// Do not stuff any logic into these. Someone WILL override it and forget to call the base.
+
+        /// Called upon the window requesting to open.
+		virtual void OnOpen() {}
+        /// Called right before the window closes.
+        virtual void OnClosing() {}
 		virtual void OnFocusLost(const RWindowEvent& e) {}
 		virtual void OnFocusGain(const RWindowEvent& e) {}
 		virtual void OnRefresh(float elapsed) {}
@@ -160,98 +171,164 @@ namespace ReWindow
 		virtual void OnMouseButtonUp(const MouseButtonUpEvent&) {}
 #pragma endregion
 
+		/// The default constructor sets a default size and window title.
 		RWindow();
+		/// Constructs a window by explicitly setting title, width and height.
 		RWindow(const std::string& title, int width, int height);
+		/// Constructs a window as above with the additional argument of explicitly setting which render API is to be used.
 		RWindow(const std::string& title, int width, int height, RenderingAPI renderer);
 
-		Vector2 GetMouseCoordinates() const {
-			return getCursorPos();
-		}
+		/// Returns a Vector2 representing mouse coordinates relative to the top-left corner of the window.
+		Vector2 GetMouseCoordinates() const;
 
-		void liftKey (Key key) {
-			currentKeyboard.PressedKeys[key] = false;
-			auto event = ReWindow::WindowEvents::KeyUpEvent(key);
-			OnKeyUp(event);
-		}
-
-		void pressKey (Key key) {
-			currentKeyboard.PressedKeys[key] = true;
-			auto eventData = KeyDownEvent(key);
-			OnKeyDown(eventData);
-		}
-#ifndef __linux___
-		void setRect (int nx, int ny, int nw, int nh) {
-			setPos(nx, ny);
-			width  = nw;
-			height = nh;
-		}
-#endif
+		/// Sets which rendering API is to be used with this window.
 		void setRenderer(RenderingAPI api);
+
+		/// Initializes all state with the window manager and rendering API, then opens the window.
 		void Open();
+
+		/// Cleans up and closes the window without destroying the handle.
 		void Close();
+
 		void CloseAndReopenInPlace();
 
-		// TODO: Must be implemented from scratch as a Motif Window in x11
-		void MessageBox();
+		void MessageBox(); // TODO: Must be implemented from scratch as a Motif Window in x11
 
-		bool isFocused() const;
-		bool isFullscreen() const;
-		bool isResizable() const;
-		bool isVsyncEnabled() const;
+		/// Returns whether the window currently has mouse and/or keyboard focus.
+		[[nodiscard]] bool isFocused() const;
+		[[nodiscard]] bool isFullscreen() const;
+		[[nodiscard]] bool isResizable() const;
+		[[nodiscard]] bool isVsyncEnabled() const;
 
-		bool isAlive() const;
+		[[nodiscard]] bool isAlive() const; // TODO: Always returns true.
 
-		void setMouseVisible(bool visible);
-		void setMouseLocked();
-		void setMouseCenter();
-		void restoreMouseFromLastCenter(); // Feels nicer for users
-
-		bool isKeyDown(Key key) const;
-		bool isMouseButtonDown(MouseButton button) const;
+		[[nodiscard]] bool isKeyDown(Key key) const;
+		[[nodiscard]] bool isMouseButtonDown(MouseButton button) const;
 
 		void setFullscreen(bool fs);
 		void setResizable(bool resizable);
 		void setVsyncEnabled(bool);
 		void setTitle(const std::string& title);
-		std::string getTitle() const;
+		[[nodiscard]] std::string getTitle() const;
+		[[nodiscard]] int getWidth() const;  // Honestly no idea if we'll keep these or still go with getSize.
+		[[nodiscard]] int getHeight() const; // getSize wasn't working for me for logging. -maxine
+		void setSizeWithoutEvent(const Vector2& size); //AAAAAHHHHHHHHH WINDOZE MAKING THINGS DIFFICULT :/ - Redacted.
+		// TODO: Move out of public API, consumers should use setFullscreen()
 		void fullscreen();
+		// TODO: Move out of public API, consumers should use setFullscreen()
 		void restoreFromFullscreen();
+
+		// TODO: Josh hates parameter-flags, it's not 1995 :/
 		bool getFlag(RWindowFlags flag) const;
+		// TODO: Josh hates parameter-flags, it's not 1995 :/
 		void setFlag(RWindowFlags flag, bool state);
 		//void init(RenderingAPI api, const char* title, int width, int height, bool vsync);
+
+		/// Tells the underlying window manager to destroy this window and drop the handle.
+		/// The window, in theory, can not be re-opened after this.
+		/// TODO: Create a destructor and move to there?
+		/// TODO: What's the semantic difference between this and Close()?
 		void destroyWindow();
+
+		/// Reads events from the underlying window manager.
+		/// TODO: Move out of public API, consumers should call refresh or ideally an update() call.
 		void pollEvents();
+
+		/// Updates the window and handles timing internally.
 		void refresh();
 		void setSize(int width, int height);
 		void setSize(const Vector2& size);
 		/// Returns the position of the window's top-left corner relative to the display
 		Vector2 getPos() const;
+		// I want to know why this is made platform specific. Is that even necessary? -maxine
+		// Because each OS / WM implements it with a different API. - josh
+		// If we stored ourselves a copy (accurately) of the window's size, we could implement it into the shared layer
+		// But this is at BEST, unreliable.
 		Vector2 getSize() const;
+
+        /// Returns the position of the "renderable area" of the window relative to it's top left corner.
+        /// (used to account for the width or the border & title bar).
+        Vector2 getPositionOfRenderableArea() const;
+
 		void setPos(int x, int y);
 		void setPos(const Vector2& pos);
 		Vector2 getCursorPos() const;
+
+		/// Pull the window to the top, such that it is displayed on top of everything else.
+		/// NOTE: The implementation is window-manager defined, and thus there is no guarantee of it always working.
 		void raise() const;
+		/// Push the window lower, such that it is effectively hidden behind other windows.
+		/// NOTE: The implementation is window-manager defined, and thus there is no guarantee of it always working.
 		void lower() const;
 		void setCursorStyle(CursorStyle style) const;
 		void setCursorCustomIcon() const;
 
+        void setCursorLocked();
+        void setCursorCenter();
+        void restoreCursorFromLastCenter(); // Feels nicer for users
+
+		///Hides the cursor when it's inside of our window.
+		///Useful for 3D game camera.
+		void setCursorVisible(bool cursor_enable);
+		bool getCursorVisible();
+
+		/// Calls OpenGL's SwapBuffers routine.
+		/// NOTE: This is only used when the underlying rendering API is set to OpenGL.
 		static void glSwapBuffers();
+        Vector2 getLastKnownResize() const;
+		void setLastKnownWindowSize(const Vector2& size);
+    protected:
+        float delta_time;
+        float refresh_rate;
+        int refresh_count;
+        bool cursor_visible = true;
+        Vector2 lastKnownWindowSize {0, 0};
+        bool flags[5];
+        std::vector<RWindowEvent> eventLog;
+        KeyboardState currentKeyboard; // Current Frame's Keyboard State
+        KeyboardState previousKeyboard; // Previous Frame's Keyboard State
+        bool fullscreenmode = false;
+        std::string title;
+        int width;
+        int height;
+        RenderingAPI renderer;
+        bool open = false;
+        bool resizable;
+
+        Vector2 mouse_coords = {0, 0};
+        Vector2 last_mouse_coords = {0, 0};
 	private:
-		Vector2 lastKnownWindowSize {0, 0};
-		bool flags[5];
-		std::vector<RWindowEvent> eventLog;
-		KeyboardState currentKeyboard; // Current Frame's Keyboard State
-		KeyboardState previousKeyboard; // Previous Frame's Keyboard State
-		bool fullscreenmode = false;
-		std::string title;
-	#ifndef __linux__
-		int x;
-		int y;
-	#endif
-		int width;
-		int height;
-		RenderingAPI renderer;
-		bool open = false;
-		bool resizable;
-	};
+
+
+		/// Returns the most accurate and recent available mouse coordinates.
+		/// @note Call this version at most **once** per-frame. It polls the X-Window server and therefore is quite slow.
+		/// @see getCursorPos();
+		Vector2 GetAccurateMouseCoordinates() const;
+
+        /// Executes event handlers for keyboard rele;ase events.
+        void processKeyRelease (Key key);
+        /// Executes event handlers for keyboard press events.
+        void processKeyPress (Key key);
+        /// Executes event handlers for window close events.
+        /// @note This will be invoked **before** the window-close procedure begins.
+		void processOnClose();
+        /// Executes event handlers for window open events.
+        /// @note This will be invoked **after** the window-open procedure completes.
+		void processOnOpen();
+		/// Executes event handlers for mouse press events.
+        void processMousePress(MouseButton btn);
+        /// Executes event handlers for mouse release events.
+        void processMouseRelease(MouseButton btn);
+        /// Executes event handlers for window focus events.
+        void processFocusIn();
+        /// Executes event handlers for window unfocus events.
+        void processFocusOut();
+
+        void processMouseMove(Vector2 last_pos, Vector2 new_pos);
+
+    private:
+
+
+
+    };
 }

main.cpp

@@ -1,7 +1,14 @@
 #include <iostream>
 #include <rewindow/types/window.h>
-#include <jlog/jlog.hpp>
+#include <rewindow/types/display.h>
+#include <rewindow/logger/logger.h>
 
+//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Windows :/
+#if _WIN32
+	#include <windows.h>
+#endif
+
+#include <GL/gl.h>
 
 Vector2 mouse_pos;
 
@@ -19,9 +26,13 @@ class MyWindow : public ReWindow::RWindow {
 	void OnKeyDown(const ReWindow::KeyDownEvent& e) override {}
 
 	void OnRefresh(float elapsed) override {
+            glClearColor(255, 0, 0, 255);
+            glClear(GL_COLOR_BUFFER_BIT);
 		glSwapBuffers();
-		auto pos = getCursorPos();
+		auto pos = GetMouseCoordinates();
 		//std::cout << pos.x << ", " << pos.y << std::endl;
+
+        RWindow::OnRefresh(elapsed);
 	}
 
 	bool OnResizeRequest(const ReWindow::WindowResizeRequestEvent& e) override {
@@ -32,22 +43,63 @@ class MyWindow : public ReWindow::RWindow {
 
 int main() {
 	auto* window = new MyWindow("Test Window", 600, 480);
+	jlog::Debug(std::format("New window '{}' created. width={} height={}", window->getTitle(), window->getWidth(), window->getHeight()));
 
 	window->setRenderer(RenderingAPI::OPENGL);
+	jlog::Debug(std::format("Rendering API OPENGL set for window '{}'", window->getTitle()));
+
 	window->Open();
+	jlog::Debug(std::format("Opened window '{}'", window->getTitle()));
 
 	// TODO: Cannot set flags until after window is open
 	// Make this work somehow
+	jlog::Debug("TODO: Cannot set flags until after window is open");
 	window->setFullscreen(false);
-	window->setVsyncEnabled(false);
-	window->setResizable(false);
+	window->setVsyncEnabled(true);
+	window->setResizable(true);
+	window->setCursorVisible(false);
+
+	/*
+    std::vector<ReWindow::Display> d = ReWindow::Display::getDisplaysFromWindowManager();
+    for (ReWindow::Display& display : d) {
+
+        auto w = display.getDefaultGraphicsMode().getWidth();
+        auto h = display.getDefaultGraphicsMode().getHeight();
+        auto r = display.getDefaultGraphicsMode().getRefreshRate();
+
+        auto aspect = (float)w/(float)h;
+
+        std::cout << "Default: ";
+        std::cout << std::format("Mode ({},{}) @ {}hz Ratio {}", w, h, r, aspect) << std::endl;
+
+        for (ReWindow::FullscreenGraphicsMode& fgm : display.getGraphicsModes()) {
+            w =  fgm.getWidth();
+            h = fgm.getHeight();
+            r = fgm.getRefreshRate();
+
+            auto aspect = (float)w/(float)h;
+
+            std::cout << std::format("Mode ({},{}) @ {}hz Ratio {}", w, h, r, aspect) << std::endl;
+        }
+    }
+    */
+
+	ReWindow::Logger::Debug(std::format("Window '{}' flags: IN_FOCUS={} FULLSCREEN={} RESIZEABLE={} VSYNC={} QUIT={}",
+		window->getTitle(),
+		window->getFlag(RWindowFlags::IN_FOCUS),
+		window->getFlag(RWindowFlags::FULLSCREEN),
+		window->getFlag(RWindowFlags::RESIZABLE),
+		window->getFlag(RWindowFlags::VSYNC),
+		window->getFlag(RWindowFlags::QUIT)));
+
 
 	window->OnKeyDownEvent += [&] (ReWindow::KeyDownEvent e) {
-        SDEBUG(e.key.CharCode);
+        jlog::Debug(e.key.CharCode);
 	};
 
+
 	window->OnMouseButtonDownEvent += [&] (ReWindow::MouseButtonDownEvent e) {
-		SDEBUG(e.Button.CharCode);
+		jlog::Debug(e.Button.CharCode);
 	};
 
 	while (window->isAlive()) {
@@ -56,6 +108,7 @@ int main() {
 	}
 }
 
+/*
 //Windows :(
 #ifdef _WIN32
 #ifndef UNICODE
@@ -67,4 +120,5 @@ extern "C" {
 		return main();
 	}
 }
-#endif
+#endif
+*/

reci/scripts/builddeps.reci

@@ -0,0 +1 @@
+Main:new("Install build dependencies", "apt-get install -yq libx11-6 libx11-dev libgl-dev")

src/logger/logger.cpp

@@ -0,0 +1,7 @@
+#include "rewindow/logger/logger.h"
+
+namespace ReWindow::Logger {
+    using namespace jlog;
+    GenericLogger Fatal {"ReWindow::fatal", GlobalLogFile, Colors::Reds::Crimson, Colors::Gray, Colors::Gray, Colors::Reds::Crimson, Colors::White};
+    GenericLogger Debug {"ReWindow::debug", GlobalLogFile, Colors::Purples::Purple, Colors::Gray, Colors::Gray, Colors::Purples::Purple, Colors::White};
+}

src/platform/linux/display.cpp

@@ -0,0 +1,74 @@
+#include <rewindow/types/display.h>
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/Xrandr.h>
+#include <stdexcept>
+
+using namespace ReWindow;
+
+std::vector<ReWindow::Display> ReWindow::Display::getDisplaysFromWindowManager() {
+    std::vector<ReWindow::Display> result;
+    _XDisplay* display = XOpenDisplay(nullptr);
+
+    if (!display)
+        throw std::runtime_error("There isn't an X11 root display????");
+
+    Window root_window = DefaultRootWindow(display);
+    XRRScreenResources* screen_resources = XRRGetScreenResources(display, root_window);
+
+    if (!screen_resources)
+        throw std::runtime_error("Failed to get screen resources.");
+
+    for (int i = 0; i < screen_resources->noutput; i++) {
+        RROutput output = screen_resources->outputs[i];
+        XRROutputInfo* output_info = XRRGetOutputInfo(display, screen_resources, output);
+
+        if (output_info->connection == RR_Connected) {
+            ReWindow::Display d;
+            XRRCrtcInfo* crtc_info = XRRGetCrtcInfo(display, screen_resources, output_info->crtc);
+
+            if (!crtc_info)
+                throw std::runtime_error("Failed to get CRT info.");
+
+            u32 default_width = (u32) crtc_info->width;
+            u32 default_height = (u32) crtc_info->height;
+            short default_refresh_rate = 0;
+
+            for (int k = 0; k < screen_resources->nmode; k++) {
+                if (screen_resources->modes[k].id == crtc_info->mode) {
+                    XRRModeInfo mode_info = screen_resources->modes[k];
+                    double refresh_rate;
+
+                    if (mode_info.hTotal > 0 && mode_info.vTotal > 0)
+                        refresh_rate = mode_info.dotClock / (double)(mode_info.hTotal * mode_info.vTotal),
+                        default_refresh_rate = (short)refresh_rate;
+
+                    d.default_graphics_mode = {default_width, default_height, default_refresh_rate};
+                    break;
+                }
+            }
+
+            for (int j = 0; j < output_info->nmode; j++) {
+                RRMode mode = output_info->modes[j];
+                for (int k = 0; k < screen_resources->nmode; k++) {
+                    if (screen_resources->modes[k].id == mode) {
+                        XRRModeInfo mode_info = screen_resources->modes[k];
+                        // Calculate refresh rate from the mode's dot clock
+                        double refresh_rate = 0.0;
+                        if (mode_info.hTotal > 0 && mode_info.vTotal > 0)
+                            refresh_rate = mode_info.dotClock / (double)(mode_info.hTotal * mode_info.vTotal);
+
+                        d.graphics_modes.emplace_back((u32) mode_info.width,(u32) mode_info.height,(short) refresh_rate);
+                    }
+                }
+            }
+            XRRFreeCrtcInfo(crtc_info);
+            result.push_back(d);
+        }
+        XRRFreeOutputInfo(output_info);
+    }
+
+    XRRFreeScreenResources(screen_resources);
+    XCloseDisplay(display);
+    return result;
+}

src/platform/linux/window.cpp

@@ -1,12 +1,13 @@
-#include <rewindow/types/window.h>
-#include <rewindow/types/cursors.h>
-#include <J3ML/J3ML.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
+#include <GL/glx.h>
 #include <cstdlib>
 #include <cstring>
-#include <thread>
+#include <rewindow/types/window.h>
+#include <rewindow/types/cursors.h>
+#include <J3ML/J3ML.hpp>
+#include <rewindow/logger/logger.h>
 
 
 
@@ -28,28 +29,86 @@ Atom windowTypeAtom;
 Atom windowTypeUtilityAtom;
 XSizeHints hints;
 GLXContext glContext;
+Cursor invisible_cursor = 0;
+
+Vector2 render_area_position = {0, 0};
+Vector2 position = {0, 0};
+bool should_poll_x_for_mouse_pos = true;
+
 
 using namespace ReWindow;
 
-void RWindow::raise() const { XRaiseWindow(display, window); }
-void RWindow::lower() const { XLowerWindow(display, window); }
+void RWindow::raise() const {
+    Logger::Debug(std::format("Raising window '{}'", this->title));
+
+    // Get the position of the renderable area relative to the rest of the window.
+    XGetWindowAttributes(display, window, &windowAttributes);
+    render_area_position =  { (float) windowAttributes.x, (float) windowAttributes.y };
+
+    XRaiseWindow(display, window);
+}
+
+void RWindow::lower() const
+{
+    Logger::Debug(std::format("Lowering window '{}'", this->title));
+    XLowerWindow(display, window);
+}
 
 void RWindow::destroyWindow() {
+    Logger::Debug(std::format("Destroying window '{}'", this->title));
     XDestroySubwindows(display, window);
+    Logger::Debug(std::format("Destroyed window '{}'", this->title));
     XDestroyWindow(display, window);
     delete this;
 }
 
 void RWindow::refresh() {
-    // TODO: Implement refresh time keeping
-    OnRefresh(0.f);
 
-    // TODO: Check if mouse coords have changed, only then fire OnMouseMove event
-    Vector2 mouse_coords = getCursorPos();
+    auto begin_frame = std::chrono::high_resolution_clock::now();
 
-    auto eventData = MouseMoveEvent(mouse_coords);
-    OnMouseMove(eventData);
-    std::this_thread::sleep_for(1ms);
+
+    OnRefresh(delta_time);
+
+    // Only call once and cache the result.
+    mouse_coords = GetAccurateMouseCoordinates();
+
+    /// TODO: Implement optional minimum epsilon to trigger a Mouse Update.
+    if (mouse_coords != last_mouse_coords) {
+        processMouseMove(last_mouse_coords, mouse_coords);
+        last_mouse_coords = mouse_coords;
+    }
+
+    auto end_frame = std::chrono::high_resolution_clock::now();
+
+    auto frame_time = end_frame - begin_frame;
+    int frame_time_ms = std::chrono::duration_cast<std::chrono::milliseconds>(frame_time).count();
+    float frame_time_s = frame_time_ms / 1000.f;
+    delta_time = frame_time_ms;
+
+    refresh_rate = 1.f / delta_time;
+
+
+    refresh_count++;
+
+
+    //std::this_thread::sleep_for(1ms);
+}
+
+void RWindow::setCursorVisible(bool cursor_enable) {
+    cursor_visible = cursor_enable;
+
+    if (invisible_cursor == 0) {
+        Pixmap blank_pixmap = XCreatePixmap(display, window, 1, 1, 1);
+        XColor dummy; dummy.pixel = 0; dummy.red = 0; dummy.flags = 0;
+        invisible_cursor = XCreatePixmapCursor(display, blank_pixmap, blank_pixmap, &dummy, &dummy, 0, 0);
+        XFreePixmap(display, blank_pixmap);
+    }
+
+    if (!cursor_enable)
+        XDefineCursor(display, window, invisible_cursor);
+
+    if (cursor_enable)
+        XUndefineCursor(display, window);
 }
 
 void RWindow::setFlag(RWindowFlags flag, bool state) {
@@ -57,11 +116,13 @@ void RWindow::setFlag(RWindowFlags flag, bool state) {
     flags[(int) flag] = state;
     //Once you've done this you cannot make it resizable again.
     if (flag == RWindowFlags::RESIZABLE && !state) {
+        Logger::Debug("Once you've done this you cannot make it resizable again.");
         hints.flags = PMinSize | PMaxSize;
         hints.min_width = hints.max_width = windowAttributes.width;
         hints.min_height = hints.max_height = windowAttributes.height;
         XSetWMNormalHints(display, window, &hints);
     }
+    Logger::Debug(std::format("Set flag '{}' to state '{}' for window '{}'", RWindowFlagToStr(flag), state, this->title));
 }
 
 void RWindow::pollEvents() {
@@ -69,242 +130,285 @@ void RWindow::pollEvents() {
         XNextEvent(display, &xev);
 
         if (xev.type == ClientMessage)
-            if (xev.xclient.message_type == XInternAtom(display, "WM_PROTOCOLS", False) && static_cast<Atom>(xev.xclient.data.l[0]) == wmDeleteWindow) {
-                destroyWindow();
-                system("xset r on");
-                exit(0);
-            }
+            Logger::Debug(std::format("Recieved event '{}'", "ClientMessage"));
+
+        if (xev.xclient.message_type == XInternAtom(display, "WM_PROTOCOLS", False) && static_cast<Atom>(xev.xclient.data.l[0]) == wmDeleteWindow) {
+
+            processOnClose();
+            destroyWindow();
+            system("xset r on");
+            exit(0);
+        }
 
         if (xev.type == FocusIn) {
+            Logger::Debug(std::format("Recieved event '{}'", "FocusIn"));
             XAutoRepeatOff(display);
-            //focusGained.Invoke();
-            RWindowEvent event {};
-            OnFocusGain(event);
             setFlag(RWindowFlags::IN_FOCUS, true);
+
+            if (!cursor_visible)
+                XDefineCursor(display, window, invisible_cursor);
+
+            // Get the position of the renderable area relative to the rest of the window.
+            XGetWindowAttributes(display, window, &windowAttributes);
+            render_area_position =  { (float) windowAttributes.x, (float) windowAttributes.y };
+            processFocusIn();
         }
 
         if (xev.type == FocusOut) {
-                XAutoRepeatOn(display);
-                //focusLost.Invoke();
-                RWindowEvent event {};
-                OnFocusLost(event);
-                setFlag(RWindowFlags::IN_FOCUS, false);
-            }
+            Logger::Debug(std::format("Recieved event '{}'", "FocusOut"));
+            XAutoRepeatOn(display);
 
-            if (xev.type == KeyRelease) {
-                auto scancode = (X11Scancode) xev.xkey.keycode;
-                auto key = GetKeyFromX11Scancode(scancode);
-                OnKeyUpEvent(key);
-                OnKeyUpEvent(key);
-                liftKey(key);
-            }
+            setFlag(RWindowFlags::IN_FOCUS, false);
+            if (!cursor_visible)
+                XUndefineCursor(display, window);
 
-            if (xev.type == KeyPress) {
-                auto scancode = (X11Scancode) xev.xkey.keycode;
-                auto key = GetKeyFromX11Scancode(scancode);
-                OnKeyDownEvent(key);
-                OnKeyDown(key);
-                pressKey(key);
-                //eventLog.push_back(eventData);
-            }
+            processFocusOut();
+        }
 
-            if (xev.type == ButtonRelease) {
-                MouseButton button = GetMouseButtonFromXButton(xev.xbutton.button);
-                auto eventData = MouseButtonUpEvent();
-                eventData.Button = button;
+        if (xev.type == KeyRelease) {
+            Logger::Debug(std::format("Recieved event '{}'", "KeyRelease"));
+            auto scancode = (X11Scancode) xev.xkey.keycode;
+            auto key = GetKeyFromX11Scancode(scancode);
+            processKeyRelease(key);
+        }
 
-                OnMouseButtonUp(eventData);
-            }
+        if (xev.type == KeyPress) {
+            Logger::Debug(std::format("Recieved event '{}'", "KeyPress"));
+            auto scancode = (X11Scancode) xev.xkey.keycode;
+            auto key = GetKeyFromX11Scancode(scancode);
+            processKeyPress(key);
+        }
 
-            if (xev.type == ButtonPress) {
-                MouseButton button = GetMouseButtonFromXButton(xev.xbutton.button);
-                auto eventData = MouseButtonDownEvent(button);
-                eventData.Button = button;
+        if (xev.type == ButtonRelease) {
+            Logger::Debug(std::format("Recieved event '{}'", "ButtonRelease"));
+            MouseButton button = GetMouseButtonFromXButton(xev.xbutton.button);
 
-                OnMouseButtonDownEvent(eventData);
-                OnMouseButtonDown(eventData);
-            }
+            processMouseRelease(button);
+        }
 
-            if (xev.type == Expose) {}
+        if (xev.type == ButtonPress) {
+            MouseButton button = GetMouseButtonFromXButton(xev.xbutton.button);
 
-            // NOTE: This event is functionally useless, as it only informs of the very beginning and end of a mouse movement.
-            if (xev.type == MotionNotify) {}
+            Logger::Debug(std::format("Window event: MouseButtonPress {}", button.CharCode));
+
+            processMousePress(button);
+        }
+
+        if (xev.type == Expose)
+        {
+            Logger::Debug(std::format("Recieved event '{}'", "Expose"));
+        }
+
+        // NOTE: This event is functionally useless, as it only informs of the very beginning and end of a mouse movement.
+        if (xev.type == MotionNotify)
+        {
+            Logger::Debug(std::format("Recieved event '{}'", "MotionNotify"));
+        }
+
+        if (xev.type == ConfigureNotify) {
+            if (this->width != xev.xconfigurerequest.width || this->height != xev.xconfigurerequest.height) {
+                Logger::Debug(std::format("Recieved event '{}'", "ResizeRequest"));
+
+                this->width = xev.xconfigurerequest.width;
+                this->height = xev.xconfigurerequest.height;
 
-            if (xev.type == ResizeRequest) {
                 auto eventData = WindowResizeRequestEvent();
+                eventData.Size = { (float) xev.xconfigurerequest.width, (float) xev.xconfigurerequest.height };
                 lastKnownWindowSize = eventData.Size;
-                eventData.Size = {(float)xev.xresizerequest.width, (float)xev.xresizerequest.height};
-                lastKnownWindowSize = eventData.Size;
+
                 OnResizeRequest(eventData);
+                OnResizeRequestEvent(eventData);
             }
+
+            //Window Moved.
+            if (position.x != xev.xconfigurerequest.x || position.y != xev.xconfigurerequest.y)
+                position = { (float) xev.xconfigurerequest.x, (float) xev.xconfigurerequest.y };
         }
 
-        previousKeyboard = currentKeyboard;
+    }
+    previousKeyboard = currentKeyboard;
+}
+
+
+// Might make the window go off the screen on some window managers.
+void RWindow::setSize(int newWidth, int newHeight) {
+    if (!getFlag(RWindowFlags::RESIZABLE)) return;
+
+    this->width = newWidth;
+    this->height = newHeight;
+    XResizeWindow(display, window, newWidth, newHeight);
+    XFlush(display);
+    Logger::Debug(std::format("Set size for window '{}'. width={} height={}", this->title, newWidth, newHeight));
+}
+
+Vector2 RWindow::GetAccurateMouseCoordinates() const {
+
+    Window root_return, child_return;
+    int root_x_ret, root_y_ret;
+    int win_x_ret, win_y_ret;
+    uint32_t mask_return;
+
+    // This seems to be relative to the top left corner of the renderable area.
+    bool mouseAvailable = XQueryPointer(display, window, &root_return, &child_return, &root_x_ret, &root_y_ret, &win_x_ret, &win_y_ret, &mask_return);
+
+    if (mouseAvailable) {
+        // TODO: normalize coordinates from displaySpace to windowSpace
+        // TODO: fire mouse movement event
+        Vector2 m_coords = { (float) win_x_ret, (float) win_y_ret };
+        return m_coords;
+    }
+    return Vector2::Zero;
+}
+
+// TODO: implement integer vector2/3 types
+Vector2 RWindow::getSize() const {
+    return {(float) this->width, (float) this->height};
+}
+
+Vector2 RWindow::getLastKnownResize() const
+{
+    return lastKnownWindowSize;
+}
+
+// TODO: implement integer vector2/3 types
+Vector2 RWindow::getPos() const {
+    return position;
+}
+
+void RWindow::setPos(int x, int y) {
+    XMoveWindow(display, window, x, y);
+    position = { (float) x, (float) y };
+}
+
+void RWindow::setPos(const Vector2& pos) {
+    setPos(pos.x, pos.y);
+}
+
+
+void RWindow::glSwapBuffers() {
+    glXSwapBuffers(display,window);
+}
+
+bool RWindow::isResizable() const {
+    return getFlag(RWindowFlags::RESIZABLE);
+}
+
+void RWindow::fullscreen() {
+    Logger::Debug(std::format("Fullscreening window '{}'", this->title));
+    fullscreenmode = true;
+
+    XEvent xev;
+    Atom wm_state   = XInternAtom(display, "_NET_WM_STATE", true);
+    Atom wm_fullscreen = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", true);
+
+    XChangeProperty(display, window, wm_state, XA_ATOM, 32, PropModeReplace, (unsigned char *)&wm_fullscreen, 1);
+    memset(&xev, 0, sizeof(xev));
+    xev.type = ClientMessage;
+    xev.xclient.window = window;
+    xev.xclient.message_type = wm_state;
+    xev.xclient.format = 32;
+    xev.xclient.data.l[0] = 1; // _NET_WM_STATE_ADD
+    xev.xclient.data.l[1] = fullscreenmode;
+    xev.xclient.data.l[2] = 0;
+    XSendEvent(display, DefaultRootWindow(display), False, SubstructureNotifyMask | SubstructureRedirectMask, &xev);
+    Logger::Debug(std::format("Fullscreened window '{}'", this->title));
+}
+
+void RWindow::restoreFromFullscreen() {
+    Logger::Debug(std::format("Restoring window '{}' from fullscreen", this->title));
+    fullscreenmode = false;
+    XEvent xev;
+    Atom wm_state = XInternAtom(display, "_NET_WM_STATE", False);
+    Atom fullscreen = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", False);
+    memset(&xev, 0, sizeof(xev));
+    xev.type = ClientMessage;
+    xev.xclient.window = window;
+    xev.xclient.message_type = wm_state;
+    xev.xclient.format = 32;
+    xev.xclient.data.l[0] = 0; // _NET_WM_STATE_REMOVE
+    xev.xclient.data.l[1] = fullscreenmode;
+    xev.xclient.data.l[2] = 0;
+    XSendEvent(display, DefaultRootWindow(display), False, SubstructureNotifyMask | SubstructureRedirectMask, &xev);
+    Logger::Debug(std::format("Restored window '{}' from fullscreen", this->title));
+}
+
+void RWindow::setVsyncEnabled(bool b) {
+    PFNGLXSWAPINTERVALEXTPROC glXSwapIntervalEXT;
+    glXSwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC)glXGetProcAddressARB((const GLubyte*)"glXSwapIntervalEXT");
+    glXSwapIntervalEXT(display, window, b);
+}
+
+bool RWindow::isFullscreen() const {
+    return fullscreenmode;
+}
+
+void RWindow::setCursorStyle(CursorStyle style) const {
+    u32 x11_cursor_resolved_enum = static_cast<u32>(style.X11Cursor);
+    Cursor c = XCreateFontCursor(display, x11_cursor_resolved_enum);
+    XDefineCursor(display, window, c);
+}
+
+void RWindow::Open() {
+    xSetWindowAttributes.border_pixel = BlackPixel(display, defaultScreen);
+    xSetWindowAttributes.background_pixel = BlackPixel(display, defaultScreen);
+    xSetWindowAttributes.override_redirect = True;
+    xSetWindowAttributes.event_mask = ExposureMask;
+    //setVsyncEnabled(vsync);
+    if (renderer == RenderingAPI::OPENGL) {
+        GLint glAttributes[] = {GLX_RGBA, GLX_DEPTH_SIZE, 24, GLX_DOUBLEBUFFER, None};
+        visual = glXChooseVisual(display, defaultScreen, glAttributes);
+        glContext = glXCreateContext(display, visual, nullptr, GL_TRUE);
     }
 
-    // Might make the window go off the screen on some window managers.
- void RWindow::setSize(int newWidth, int newHeight) {
-        if (!getFlag(RWindowFlags::RESIZABLE)) return;
+    xSetWindowAttributes.colormap = XCreateColormap(display, RootWindow(display, defaultScreen), visual->visual, AllocNone);
 
-        this->width = newWidth;
-        this->height = newHeight;
-        XResizeWindow(display, window, width, height);
-    }
-
-    Vector2 RWindow::getCursorPos() const {
-        Window root = XDefaultRootWindow(display);
-        Window root_return;
-        Window child_return;
-        int root_x_ret;
-        int root_y_ret;
-        int win_x_ret;
-        int win_y_ret;
-        uint32_t mask_return;
-        unsigned m;
-        bool mouseAvailable = XQueryPointer(display, window, &root_return, &child_return, &root_x_ret, &root_y_ret, &win_x_ret, &win_y_ret, &mask_return);
-
-        if (mouseAvailable) {
-            // TODO: process retrieved mouse coordinates
-            // TODO: normalize coordinates from displaySpace to windowSpace
-            // TODO: fire mouse movement event
-            //std::cout << win_x_ret << ", " << win_y_ret << std::endl;
-            // TODO: Compensate for height of window TitleBar + window border width
-            float window_border_width = 2;
-            float window_titlebar_height = 18;
-            Vector2 mouse_coords_raw = {(float)win_x_ret+window_border_width, (float)win_y_ret+window_titlebar_height};
-            auto window_pos = getPos();
-            return mouse_coords_raw - window_pos;
-        }
-        return Vector2::Zero;
-    }
-
-    // TODO: implement integer vector2/3 types
-    Vector2 RWindow::getSize() const {
-        XGetWindowAttributes(display,window,&windowAttributes);
-        return {(float)windowAttributes.width, (float)windowAttributes.height};
-    }
-
-    // TODO: implement integer vector2/3 types
-    Vector2 RWindow::getPos() const {
-        XGetWindowAttributes(display,window,&windowAttributes);
-        return {(float)windowAttributes.x, (float)windowAttributes.y};
-    }
-
-    void RWindow::setPos(int x, int y) {
-        XMoveWindow(display, window, x, y);
-    }
-
-    void RWindow::setPos(const Vector2& pos) {
-        this->setPos(pos.x, pos.y);
-    }
-
-
-    void RWindow::glSwapBuffers() {
-        glXSwapBuffers(display,window);
-    }
-
-    bool RWindow::isResizable() const {
-        return this->getFlag(RWindowFlags::RESIZABLE);
-    }
-
-    void RWindow::fullscreen() {
-        fullscreenmode = true;
-
-        XEvent xev;
-        Atom wm_state   = XInternAtom(display, "_NET_WM_STATE", true);
-        Atom wm_fullscreen = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", true);
-
-        XChangeProperty(display, window, wm_state, XA_ATOM, 32, PropModeReplace, (unsigned char *)&wm_fullscreen, 1);
-        memset(&xev, 0, sizeof(xev));
-        xev.type = ClientMessage;
-        xev.xclient.window = window;
-        xev.xclient.message_type = wm_state;
-        xev.xclient.format = 32;
-        xev.xclient.data.l[0] = 1; // _NET_WM_STATE_ADD
-        xev.xclient.data.l[1] = fullscreenmode;
-        xev.xclient.data.l[2] = 0;
-        XSendEvent(display, DefaultRootWindow(display), False, SubstructureNotifyMask | SubstructureRedirectMask, &xev);
-    }
-
-    void RWindow::restoreFromFullscreen() {
-        fullscreenmode = false;
-        XEvent xev;
-        Atom wm_state = XInternAtom(display, "_NET_WM_STATE", False);
-        Atom fullscreen = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", False);
-        memset(&xev, 0, sizeof(xev));
-        xev.type = ClientMessage;
-        xev.xclient.window = window;
-        xev.xclient.message_type = wm_state;
-        xev.xclient.format = 32;
-        xev.xclient.data.l[0] = 0; // _NET_WM_STATE_REMOVE
-        xev.xclient.data.l[1] = fullscreenmode;
-        xev.xclient.data.l[2] = 0;
-        XSendEvent(display, DefaultRootWindow(display), False, SubstructureNotifyMask | SubstructureRedirectMask, &xev);
-    }
-
-    void RWindow::setVsyncEnabled(bool b) {
-        PFNGLXSWAPINTERVALEXTPROC glXSwapIntervalEXT;
-        glXSwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC)glXGetProcAddressARB((const GLubyte*)"glXSwapIntervalEXT");
-        glXSwapIntervalEXT(display, window, b);
-    }
-
-    bool RWindow::isFullscreen() const {
-        return fullscreenmode;
-    }
-
-    void RWindow::setCursorStyle(CursorStyle style) const {
-        u32 x11_cursor_resolved_enum = static_cast<u32>(style.X11Cursor);
-        Cursor c = XCreateFontCursor(display, x11_cursor_resolved_enum);
-        XDefineCursor(display, window, c);
-    }
-
-    void RWindow::Open() {
-        xSetWindowAttributes.border_pixel = BlackPixel(display, defaultScreen);
-        xSetWindowAttributes.background_pixel = BlackPixel(display, defaultScreen);
-        xSetWindowAttributes.override_redirect = True;
-        xSetWindowAttributes.event_mask = ExposureMask;
-        //setVsyncEnabled(vsync);
-        if (renderer == RenderingAPI::OPENGL) {
-            GLint glAttributes[] = {GLX_RGBA, GLX_DEPTH_SIZE, 24, GLX_DOUBLEBUFFER, None};
-            visual = glXChooseVisual(display, defaultScreen, glAttributes);
-            glContext = glXCreateContext(display, visual, nullptr, GL_TRUE);
-        }
-
-        xSetWindowAttributes.colormap = XCreateColormap(display, RootWindow(display, defaultScreen), visual->visual, AllocNone);
-
-        window = XCreateWindow(display, RootWindow(display, defaultScreen), 0, 0, width, height, 0, visual->depth,
-                               InputOutput, visual->visual, CWBackPixel | CWColormap | CWBorderPixel | NoEventMask,
-                               &xSetWindowAttributes);
-	// Set window to floating because fucking tiling WMs
-	windowTypeAtom = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
-	windowTypeUtilityAtom = XInternAtom(display, "_NET_WM_WINDOW_TYPE_UTILITY", False);
-        XChangeProperty(display, window, windowTypeAtom, XA_ATOM, 32, PropModeReplace,
+    window = XCreateWindow(display, RootWindow(display, defaultScreen), 0, 0, width, height, 0, visual->depth,
+                           InputOutput, visual->visual, CWBackPixel | CWColormap | CWBorderPixel | NoEventMask,
+                           &xSetWindowAttributes);
+    // Set window to floating because fucking tiling WMs
+    windowTypeAtom = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
+    windowTypeUtilityAtom = XInternAtom(display, "_NET_WM_WINDOW_TYPE_UTILITY", False);
+    XChangeProperty(display, window, windowTypeAtom, XA_ATOM, 32, PropModeReplace,
                     (unsigned char *)&windowTypeUtilityAtom, 1);
-	//
-        XSelectInput(display, window,
-                     ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
-                     PointerMotionMask |
-                     PointerMotionHintMask | FocusChangeMask | StructureNotifyMask | SubstructureRedirectMask |
-                     SubstructureNotifyMask | CWColormap | ResizeRequest | ResizeRedirectMask);
-        XMapWindow(display, window);
-        XStoreName(display, window, title.c_str());
-        wmDeleteWindow = XInternAtom(display, "WM_DELETE_WINDOW", False);
-        XSetWMProtocols(display, window, &wmDeleteWindow, 1);
+    //
+    XSelectInput(display, window,
+                 ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+                 PointerMotionMask |
+                 PointerMotionHintMask | FocusChangeMask | StructureNotifyMask | SubstructureRedirectMask |
+                 SubstructureNotifyMask | CWColormap);
+    XMapWindow(display, window);
+    XStoreName(display, window, title.c_str());
+    wmDeleteWindow = XInternAtom(display, "WM_DELETE_WINDOW", False);
+    XSetWMProtocols(display, window, &wmDeleteWindow, 1);
 
-        if (renderer == RenderingAPI::OPENGL)
-            glXMakeCurrent(display, window, glContext);
-        open = true;
-    }
+    if (renderer == RenderingAPI::OPENGL)
+        glXMakeCurrent(display, window, glContext);
 
-    void RWindow::setTitle(const std::string &title) {
-        this->title = title;
-        XStoreName(display, window, title.c_str());
-    }
+    // Get the position of the renderable area relative to the rest of the window.
+    XGetWindowAttributes(display, window, &windowAttributes);
+    render_area_position =  { (float) windowAttributes.x, (float) windowAttributes.y };
+    open = true;
 
-    // TODO: Implement MouseButton map
-    bool RWindow::isMouseButtonDown(MouseButton button) const {
-        return false;
-    }
 
-    // TODO: Implement ControllerButton map
+    processOnOpen();
+}
+
+void RWindow::setTitle(const std::string &title) {
+    this->title = title;
+    XStoreName(display, window, title.c_str());
+}
+
+// TODO: Implement MouseButton map
+bool RWindow::isMouseButtonDown(MouseButton button) const {
+    return false;
+}
+
+Vector2 RWindow::getPositionOfRenderableArea() const {
+    return render_area_position;
+}
+
+
+
+
+// TODO: Implement ControllerButton map
 

src/platform/shared/display.cpp

@@ -0,0 +1,34 @@
+#include <rewindow/types/display.h>
+
+using namespace ReWindow;
+
+FullscreenGraphicsMode::FullscreenGraphicsMode(u32 width, u32 height, short refresh_rate) {
+    this->width = width;
+    this->height = height;
+    this->refresh_rate = refresh_rate;
+}
+
+u32 FullscreenGraphicsMode::getWidth() const {
+    return width;
+}
+
+u32 FullscreenGraphicsMode::getHeight() const {
+    return height;
+}
+
+float FullscreenGraphicsMode::getRefreshRate() const {
+    return refresh_rate;
+}
+
+FullscreenGraphicsMode Display::getDefaultGraphicsMode() {
+    return default_graphics_mode;
+}
+
+std::vector<FullscreenGraphicsMode> Display::getGraphicsModes() {
+    return graphics_modes;
+}
+
+Display::Display(const FullscreenGraphicsMode& default_graphics_mode, const std::vector<FullscreenGraphicsMode>& graphics_modes) {
+    this->default_graphics_mode = default_graphics_mode;
+    this->graphics_modes = graphics_modes;
+}

src/platform/shared/window.cpp

@@ -1,4 +1,17 @@
-#include <rewindow/types/window.h>
+ #include <rewindow/types/window.h>
+#include "rewindow/logger/logger.h"
+std::string RWindowFlagToStr(RWindowFlags flag) {
+    switch (flag) {
+        case RWindowFlags::IN_FOCUS: return "IN_FOCUS";
+        case RWindowFlags::FULLSCREEN: return "FULLSCREEN";
+        case RWindowFlags::RESIZABLE: return "RESIZEABLE";
+        case RWindowFlags::VSYNC: return "VSYNC";
+        case RWindowFlags::QUIT: return "QUIT";
+        case RWindowFlags::MAX_FLAG: return "MAX_FLAG";
+        default:
+            return "unimplemented flag";
+    }
+};
 
 using namespace ReWindow;
 
@@ -19,7 +32,13 @@ RWindow::RWindow(const std::string& title, int width, int height) : flags{false,
 RWindow::RWindow(const std::string& title, int width, int height, RenderingAPI renderer) :
         title(title), width(width), height(height), renderer(renderer) {}
 
-bool RWindow::getFlag(RWindowFlags flag) const {return flags[(int)flag];}
+Vector2 RWindow::GetMouseCoordinates() const {
+    return mouse_coords;
+}
+
+bool RWindow::getFlag(RWindowFlags flag) const {
+    return flags[(int) flag];
+}
 
 bool RWindow::isAlive() const {
     return true;
@@ -37,10 +56,79 @@ void RWindow::setFullscreen(bool fs) {
         restoreFromFullscreen();
 }
 
+void RWindow::processFocusIn()
+{
+    RWindowEvent event {};
+    OnFocusGain(event);
+    OnFocusGainEvent(event);
+}
+
+void RWindow::processFocusOut()
+{
+    RWindowEvent event {};
+    OnFocusLost(event);
+    OnFocusLostEvent(event);
+}
+
+void RWindow::processMousePress(MouseButton btn)
+{
+    auto eventData = MouseButtonDownEvent(btn);
+    OnMouseButtonDownEvent(eventData);
+    OnMouseButtonDown(eventData);
+}
+
+void RWindow::processMouseMove(Vector2 last_pos, Vector2 new_pos)
+{
+    auto eventData = MouseMoveEvent(new_pos);
+    OnMouseMove(eventData);
+    OnMouseMoveEvent(eventData);
+}
+
+void RWindow::processMouseRelease(MouseButton btn)
+{
+    auto eventData = MouseButtonUpEvent(btn);
+    OnMouseButtonUpEvent(eventData);
+    OnMouseButtonUp(eventData);
+}
+
+void RWindow::processKeyRelease(Key key) {
+    currentKeyboard.PressedKeys[key] = false;
+    auto event = KeyUpEvent(key);
+    OnKeyUp(event);
+    OnKeyUpEvent(key);
+}
+
+
 std::string RWindow::getTitle() const {
     return this->title;
 }
 
+/*
+Vector2 RWindow::getSize() const
+{
+    return {this->width, this->height};
+}
+*/
+
+int RWindow::getWidth() const
+{
+    return this->width;
+}
+
+int RWindow::getHeight() const
+{
+    return this->height;
+}
+
+void RWindow::setSizeWithoutEvent(const Vector2& size) {
+    width = size.x;
+    height = size.y;
+}
+
+void RWindow::setLastKnownWindowSize(const Vector2& size) {
+    lastKnownWindowSize = size;
+}
+
 void RWindow::setRenderer(RenderingAPI api) {
     renderer = api;
 }
@@ -56,4 +144,29 @@ bool RWindow::isKeyDown(Key key) const {
         if (pair.first == key && pair.second)
             return true;
     return false;
+}
+
+void RWindow::processKeyPress(Key key) {
+    currentKeyboard.PressedKeys[key] = true;
+    auto eventData = KeyDownEvent(key);
+    OnKeyDown(eventData);
+    OnKeyDownEvent(key);
+}
+
+void RWindow::processOnClose()
+{
+    OnClosing();
+    OnClosingEvent();
+}
+
+void RWindow::processOnOpen()
+{
+    OnOpen();
+    OnOpenEvent();
+}
+
+
+void RWindow::Close() {
+    /// TODO: Implement closing the window without destroying the handle.
+    processOnClose();
 }

src/platform/windows/window.cpp

@@ -1,11 +1,12 @@
-#include <rewindow/types/window.h>
+#include <Windows.h>
 #include <gl/GL.h>
+#include <rewindow/types/window.h>
 
 using namespace ReWindow;
 
 bool fullscreenmode = false;
 bool open = false;
-HINSTANCE hInstance = GetModuleHandle(NULL);
+HINSTANCE hInstance = GetModuleHandle(nullptr);
 HWND hwnd;
 HDC hdc;
 HGLRC glContext;
@@ -18,7 +19,9 @@ void RWindow::setFlag(RWindowFlags flag, bool state) {
     if (flag == RWindowFlags::RESIZABLE && !state) {
         RECT rect;
         GetWindowRect(hwnd, &rect);
-        SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_THICKFRAME);
+        LONG style = GetWindowLong(hwnd, GWL_STYLE);
+        style &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX);
+        SetWindowLong(hwnd, GWL_STYLE, style);
         SetWindowPos(hwnd, nullptr, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOOWNERZORDER);
     }
 }
@@ -33,7 +36,6 @@ void RWindow::pollEvents() {
 
 void RWindow::setSize(int newWidth, int newHeight) {
     if (!getFlag(RWindowFlags::RESIZABLE)) return;
-
     this->width = newWidth;
     this->height = newHeight;
     SetWindowPos(hwnd, nullptr, 0, 0, width, height, SWP_NOMOVE | SWP_NOZORDER);
@@ -46,6 +48,15 @@ Vector2 RWindow::getCursorPos() const {
     return { (float)point.x, (float)point.y };
 }
 
+void RWindow::setCursorVisible(bool cursor_enable) {
+    cursor_visible = cursor_enable;
+}
+
+bool RWindow::getCursorVisible() {
+    return cursor_visible;
+}
+
+
 Vector2 RWindow::getSize() const {
     RECT rect;
     GetClientRect(hwnd, &rect);
@@ -74,8 +85,7 @@ void RWindow::restoreFromFullscreen() {
 
 void RWindow::setVsyncEnabled(bool b) {
     typedef BOOL(WINAPI* PFNWGLSWAPINTERVALEXTPROC)(int interval);
-    PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = nullptr;
-    wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
+    auto wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
 
     if (wglSwapIntervalEXT)
         wglSwapIntervalEXT(b ? 1 : 0);
@@ -88,39 +98,182 @@ bool RWindow::isFullscreen() const {
 RWindow* eWindow = nullptr;
 KeyboardState* pKeyboard = nullptr;
 KeyboardState* cKeyboard = nullptr;
+
 //Event loop.
 LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
     switch (uMsg) {
-        case WM_CLOSE:
-            DestroyWindow(hwnd);
-        case WM_DESTROY:
-            exit(0);
-        case WM_SIZE:
-                break;
-        case WM_KEYDOWN: {
-            auto key = GetKeyFromWindowsScancode((WindowsScancode) wParam);
-            //Key repeat fix.
-            if (!pKeyboard->PressedKeys[key]) {
-                eWindow->OnKeyDownEvent(key);
-                eWindow->OnKeyDown(key);
-                eWindow->pressKey(key);
+            case WM_CLOSE: {
+                    DestroyWindow(hwnd);
             }
-            break;
-        }
-        case WM_KEYUP: {
-            auto key = GetKeyFromWindowsScancode((WindowsScancode) wParam);
-            eWindow->OnKeyUpEvent(key);
-            eWindow->OnKeyUp(key);
-            eWindow->liftKey(key);
-            break;
-        }
-        case WM_LBUTTONDOWN:
-                break;
-        case WM_LBUTTONUP:
+
+            case WM_DESTROY: {
+                    exit(0);
+            }
+
+            case WM_SIZE: {
+                    eWindow->setSizeWithoutEvent({(float) LOWORD(lParam), (float) HIWORD(lParam)});
+                    auto eventData = WindowResizeRequestEvent();
+                    eventData.Size = {(float) eWindow->getWidth(), (float) eWindow->getHeight()};
+                    eWindow->setLastKnownWindowSize({(float) eWindow->getWidth(), (float) eWindow->getHeight()});
+                    eWindow->OnResizeRequest(eventData);
+                    eWindow->OnResizeRequestEvent(eventData);
+                    //Just to be absolutely sure the OpenGL viewport resizes along with the window.
+                    glViewport(0, 0, eWindow->getWidth(), eWindow->getHeight());
+                    break;
+                }
+
+            case WM_SETFOCUS: {
+                    RWindowEvent event {};
+                    eWindow->OnFocusGain(event);
+                    eWindow->OnFocusGainEvent(event);
+
+                    eWindow->setFlag(RWindowFlags::IN_FOCUS, true);
+                    break;
+            }
+
+            case WM_KILLFOCUS: {
+                    RWindowEvent event {};
+                    eWindow->OnFocusLost(event);
+                    eWindow->OnFocusLostEvent(event);
+
+                    eWindow->setFlag(RWindowFlags::IN_FOCUS, false);
+                    break;
+            }
+
+            case WM_SETCURSOR: {
+                    if (LOWORD(lParam) == HTCLIENT && eWindow->getCursorVisible() == false)
+                        SetCursor(nullptr);
                 break;
+            }
+
+            case WM_KEYDOWN: {
+                    auto key = GetKeyFromWindowsScancode((WindowsScancode) wParam);
+                    //Key repeat fix.
+                    if (!pKeyboard->PressedKeys[key]) {
+                        eWindow->OnKeyDownEvent(key);
+                        eWindow->OnKeyDown(key);
+                        eWindow->pressKey(key);
+                    }
+                    break;
+            }
+
+            case WM_KEYUP: {
+                    auto key = GetKeyFromWindowsScancode((WindowsScancode) wParam);
+                    eWindow->OnKeyUpEvent(key);
+                    eWindow->OnKeyUp(key);
+                    eWindow->liftKey(key);
+                    break;
+            }
+
+            //Mouse Buttons.
+            case WM_MOUSEWHEEL: {
+                    auto eventData = MouseButtonDownEvent();
+                    int wheel_delta = GET_WHEEL_DELTA_WPARAM(wParam);
+
+                    //If the wheel delta is positive it's MWheelUp, Negative is MWheelDown.
+                    if (wheel_delta > 0)
+                        eventData.Button = MouseButtons::MWheelUp,
+                        eWindow->OnMouseButtonDownEvent(eventData),
+                        eWindow->OnMouseButtonDown(eventData);
+
+                    else
+                        eventData.Button = MouseButtons::MWheelDown,
+                        eWindow->OnMouseButtonDownEvent(eventData),
+                        eWindow->OnMouseButtonDown(eventData);
+                    break;
+            }
+
+            case WM_LBUTTONDOWN: {
+                    auto eventData = MouseButtonDownEvent();
+                    eventData.Button = MouseButtons::Left;
+
+                    eWindow->OnMouseButtonDownEvent(eventData);
+                    eWindow->OnMouseButtonDown(eventData);
+                    break;
+            }
+
+            case WM_LBUTTONUP: {
+                    auto eventData = MouseButtonUpEvent();
+                    eventData.Button = MouseButtons::Left;
+
+                    eWindow->OnMouseButtonUpEvent(eventData);
+                    eWindow->OnMouseButtonUp(eventData);
+                    break;
+            }
+
+            case WM_RBUTTONDOWN: {
+                    auto eventData = MouseButtonDownEvent();
+                    eventData.Button = MouseButtons::Right;
+
+                    eWindow->OnMouseButtonDownEvent(eventData);
+                    eWindow->OnMouseButtonDown(eventData);
+                    break;
+            }
+
+            case WM_RBUTTONUP: {
+                    auto eventData = MouseButtonUpEvent();
+                    eventData.Button = MouseButtons::Right;
+
+                    eWindow->OnMouseButtonUpEvent(eventData);
+                    eWindow->OnMouseButtonUp(eventData);
+                    break;
+            }
+
+            case WM_MBUTTONDOWN: {
+                    auto eventData = MouseButtonDownEvent();
+                    eventData.Button = MouseButtons::Middle;
+
+                    eWindow->OnMouseButtonDownEvent(eventData);
+                    eWindow->OnMouseButtonDown(eventData);
+                    break;
+            }
+
+            case WM_MBUTTONUP: {
+                    auto eventData = MouseButtonUpEvent();
+                    eventData.Button = MouseButtons::Middle;
+
+                    eWindow->OnMouseButtonUpEvent(eventData);
+                    eWindow->OnMouseButtonUp(eventData);
+                    break;
+            }
+
+            case WM_XBUTTONDOWN: {
+                    WORD button = GET_XBUTTON_WPARAM(wParam);
+                    auto eventData = MouseButtonDownEvent();
+
+                    if (button == XBUTTON1)
+                        eventData.Button = MouseButtons::Mouse4,
+                        eWindow->OnMouseButtonDownEvent(eventData),
+                        eWindow->OnMouseButtonDown(eventData);
+
+                    if (button == XBUTTON2)
+                        eventData.Button = MouseButtons::Mouse5,
+                        eWindow->OnMouseButtonDownEvent(eventData),
+                        eWindow->OnMouseButtonDown(eventData);
+                    break;
+            }
+
+            case WM_XBUTTONUP: {
+                    WORD button = GET_XBUTTON_WPARAM(wParam);
+                    auto eventData = MouseButtonUpEvent();
+
+                    if (button == XBUTTON1)
+                        eventData.Button = MouseButtons::Mouse4,
+                        eWindow->OnMouseButtonUpEvent(eventData),
+                        eWindow->OnMouseButtonUp(eventData);
+
+                    if (button == XBUTTON2)
+                        eventData.Button = MouseButtons::Mouse5,
+                        eWindow->OnMouseButtonUpEvent(eventData),
+                        eWindow->OnMouseButtonUp(eventData);
+                    break;
+        }
+
+        //This is the same as "Motion Notify" in the X Window System.
         case WM_MOUSEMOVE:
-                break;
+            break;
     }
+
     if (pKeyboard != nullptr && cKeyboard != nullptr)
         pKeyboard = cKeyboard;
     
@@ -138,7 +291,6 @@ void RWindow::Open() {
     wc.hInstance = hInstance;
     wc.lpszClassName = "RWindowClass";
     RegisterClass(&wc);
-
     hwnd = CreateWindowEx(
         0,
         "RWindowClass",
@@ -195,5 +347,4 @@ void RWindow::refresh() {
 
     auto eventData = MouseMoveEvent(mouse_coords);
     OnMouseMove(eventData);
-    std::this_thread::sleep_for(1ms);
 }

src/types/gamepadbutton.cpp

@@ -0,0 +1,9 @@
+#include <rewindow/types/gamepadbutton.h>
+
+bool GamepadButton::operator==(const GamepadButton &rhs) const {
+    return this->GetMnemonicButtonCode() == rhs.GetMnemonicButtonCode();
+}
+
+void GamepadThumbstick::SetDeadzone(float minimum) const {
+
+}

src/types/key.cpp

@@ -1,5 +1,5 @@
 #include <rewindow/types/key.h>
-#include <memory>
+//#include <rewindow/logger.h>
 //std::vector<Key> Key::keyboard = {};
 
 std::vector<Key> Key::GetKeyboard() { return keyboard; }
@@ -15,12 +15,7 @@ Key::Key(const char* charcode, X11Scancode scancode, WindowsScancode sc)
     keyboard.push_back(*this);
 }
 
-MouseButton::MouseButton() {
-}
 
-MouseButton::MouseButton(const char* charcode) {
-    this->CharCode = charcode;
-}
 
 bool Key::operator==(const Key &rhs) const {
     //This is not a good workaround.
@@ -29,4 +24,23 @@ bool Key::operator==(const Key &rhs) const {
 
 bool Key::operator<(const Key &rhs) const {
     return (this->CharCode < rhs.CharCode);
-}
+}
+
+
+
+Key GetKeyFromX11Scancode(X11Scancode code) {
+    for (const auto& key : Key::GetKeyboard())
+        if (key.x11ScanCode == code)
+            return key;
+    std::cout << "Unavaliable Scancode: " + std::to_string((int)code) << std::endl;
+    return Keys::Space;
+}
+
+Key GetKeyFromWindowsScancode(WindowsScancode code) {
+    for (const auto& key : Key::GetKeyboard())
+        if (key.winScanCode == code)
+            return key;
+
+    std::cout << "Unavaliable Scancode: " + std::to_string((int) code) << std::endl;
+    return Keys::Space;
+}

src/types/mousebutton.cpp

@@ -0,0 +1,33 @@
+#include <rewindow/types/mousebutton.h>
+#include <string>
+#include "rewindow/logger/logger.h"
+
+MouseButton::MouseButton() {
+}
+
+MouseButton::MouseButton(const char* charcode, unsigned int index) {
+    this->CharCode = charcode;
+    this->ButtonIndex = index;
+}
+
+bool MouseButton::operator==(const MouseButton &mb) const {
+    return (mb.ButtonIndex == this->ButtonIndex);
+}
+
+
+MouseButton GetMouseButtonFromXButton(unsigned int button) {
+    switch(button) {
+        case 1: return MouseButtons::Left;
+        case 2: return MouseButtons::Middle;
+        case 3: return MouseButtons::Right;
+        case 4: return MouseButtons::MWheelUp;
+        case 5: return MouseButtons::MWheelDown;
+            //For *whatever* reason. These aren't in X.h
+        case 8: return MouseButtons::Mouse4;
+        case 9: return MouseButtons::Mouse5;
+        default: {
+            ReWindow::Logger::Fatal("Undefined XButtonCode: " + std::to_string((int) button));
+            return MouseButtons::Unimplemented;
+        }
+    }
+}