diff options
Diffstat (limited to 'src/common/emu_window.h')
| -rw-r--r-- | src/common/emu_window.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h index 23f178fdf..34cecb40b 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h | |||
| @@ -16,7 +16,7 @@ class EmuWindow | |||
| 16 | 16 | ||
| 17 | public: | 17 | public: |
| 18 | /// Data structure to store an emuwindow configuration | 18 | /// Data structure to store an emuwindow configuration |
| 19 | struct Config{ | 19 | struct WindowConfig { |
| 20 | bool fullscreen; | 20 | bool fullscreen; |
| 21 | int res_width; | 21 | int res_width; |
| 22 | int res_height; | 22 | int res_height; |
| @@ -34,17 +34,19 @@ public: | |||
| 34 | /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread | 34 | /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread |
| 35 | virtual void DoneCurrent() = 0; | 35 | virtual void DoneCurrent() = 0; |
| 36 | 36 | ||
| 37 | virtual void ReloadSetKeymaps() = 0; | ||
| 38 | |||
| 37 | /// Signals a key press action to the HID module | 39 | /// Signals a key press action to the HID module |
| 38 | static void KeyPressed(KeyMap::HostDeviceKey key); | 40 | static void KeyPressed(KeyMap::HostDeviceKey key); |
| 39 | 41 | ||
| 40 | /// Signals a key release action to the HID module | 42 | /// Signals a key release action to the HID module |
| 41 | static void KeyReleased(KeyMap::HostDeviceKey key); | 43 | static void KeyReleased(KeyMap::HostDeviceKey key); |
| 42 | 44 | ||
| 43 | Config GetConfig() const { | 45 | WindowConfig GetConfig() const { |
| 44 | return m_config; | 46 | return m_config; |
| 45 | } | 47 | } |
| 46 | 48 | ||
| 47 | void SetConfig(const Config& val) { | 49 | void SetConfig(const WindowConfig& val) { |
| 48 | m_config = val; | 50 | m_config = val; |
| 49 | } | 51 | } |
| 50 | 52 | ||
| @@ -86,6 +88,6 @@ protected: | |||
| 86 | int m_client_area_height; ///< Current client height, should be set by window impl. | 88 | int m_client_area_height; ///< Current client height, should be set by window impl. |
| 87 | 89 | ||
| 88 | private: | 90 | private: |
| 89 | Config m_config; ///< Internal configuration | 91 | WindowConfig m_config; ///< Internal configuration |
| 90 | 92 | ||
| 91 | }; | 93 | }; |