summaryrefslogtreecommitdiffstats
path: root/src/common/emu_window.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-10-08 01:44:13 +0200
committerbunnei <bunneidev@gmail.com>2014-10-08 01:44:13 +0200
commita171000cbec1dbae4e5c0c34ea1d7ef1b4313164 (patch)
treea6bc766749aabd4eb8df276749fe51db49ee7030 /src/common/emu_window.h
parentMerge pull request #129 from linkmauve/master (diff)
parentAdded configuration file system. (diff)
downloadyuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar
yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.gz
yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.bz2
yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.lz
yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.xz
yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.zst
yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.zip
Diffstat (limited to 'src/common/emu_window.h')
-rw-r--r--src/common/emu_window.h10
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
public:
/// Data structure to store an emuwindow configuration
- struct Config{
+ struct WindowConfig {
bool fullscreen;
int res_width;
int res_height;
@@ -34,17 +34,19 @@ public:
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
virtual void DoneCurrent() = 0;
+ virtual void ReloadSetKeymaps() = 0;
+
/// Signals a key press action to the HID module
static void KeyPressed(KeyMap::HostDeviceKey key);
/// Signals a key release action to the HID module
static void KeyReleased(KeyMap::HostDeviceKey key);
- Config GetConfig() const {
+ WindowConfig GetConfig() const {
return m_config;
}
- void SetConfig(const Config& val) {
+ void SetConfig(const WindowConfig& val) {
m_config = val;
}
@@ -86,6 +88,6 @@ protected:
int m_client_area_height; ///< Current client height, should be set by window impl.
private:
- Config m_config; ///< Internal configuration
+ WindowConfig m_config; ///< Internal configuration
};