From 1c1abee61af84500e8c88e7502e6fc3982e20bac Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 28 Feb 2021 04:10:48 +1000 Subject: [PATCH] NoGUI: Linux compile fix --- src/common/vulkan/texture.h | 2 +- src/duckstation-nogui/evdev_key_names.h | 4 ++-- src/duckstation-nogui/vty_host_interface.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/vulkan/texture.h b/src/common/vulkan/texture.h index 232220ca2..179244bce 100644 --- a/src/common/vulkan/texture.h +++ b/src/common/vulkan/texture.h @@ -6,7 +6,7 @@ #pragma once #include "../types.h" #include "vulkan_loader.h" -#include +#include #include namespace Vulkan { diff --git a/src/duckstation-nogui/evdev_key_names.h b/src/duckstation-nogui/evdev_key_names.h index 093d5d38c..208d19bba 100644 --- a/src/duckstation-nogui/evdev_key_names.h +++ b/src/duckstation-nogui/evdev_key_names.h @@ -258,13 +258,13 @@ static const std::map s_evdev_key_names = {{KEY_ESC, "Escape"} {KEY_RFKILL, "Rfkill"}, {KEY_MICMUTE, "Micmute"}}; -const char* GetKeyName(int key) +static const char* GetKeyName(int key) { const auto it = s_evdev_key_names.find(key); return it == s_evdev_key_names.end() ? nullptr : it->second; } -std::optional GetKeyCodeForName(const std::string_view key_name) +static std::optional GetKeyCodeForName(const std::string_view key_name) { for (const auto& it : s_evdev_key_names) { diff --git a/src/duckstation-nogui/vty_host_interface.cpp b/src/duckstation-nogui/vty_host_interface.cpp index 7b313e943..2bbd32778 100644 --- a/src/duckstation-nogui/vty_host_interface.cpp +++ b/src/duckstation-nogui/vty_host_interface.cpp @@ -164,7 +164,7 @@ void VTYHostInterface::PollEvDevKeyboards() if (static_cast(code) < countof(ImGuiIO::KeysDown)) ImGui::GetIO().KeysDown[code] = pressed; - HandleHostKeyEvent(code, pressed); + HandleHostKeyEvent(code, 0, pressed); } } }